(file) Return to platform_HPUX_ACC.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/platform_HPUX_ACC.mak between version 1.45 and 1.46

version 1.45, 2007/07/06 18:17:07 version 1.46, 2008/05/22 17:43:53
Line 97 
Line 97 
  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE  DEFINES += -DPEGASUS_PAM_AUTHENTICATION -DPEGASUS_NO_PASSWORDFILE
 endif endif
  
 # l10n  
 ifdef PEGASUS_HAS_MESSAGES ifdef PEGASUS_HAS_MESSAGES
   DEFINES += -DPEGASUS_HAS_MESSAGES      ifeq ($(PEGASUS_HAS_ICU),true)
   ifdef ICU_ROOT  
         MSG_COMPILE = ${ICU_INSTALL}/bin/genrb         MSG_COMPILE = ${ICU_INSTALL}/bin/genrb
         MSG_FLAGS =         MSG_FLAGS =
         MSG_SOURCE_EXT = .txt         MSG_SOURCE_EXT = .txt
         MSG_COMPILE_EXT = .res         MSG_COMPILE_EXT = .res
         CNV_ROOT_CMD = cnv2rootbundle         CNV_ROOT_CMD = cnv2rootbundle
  
 ##################################          SYS_INCLUDES += -I${ICU_INSTALL}/include
 ##  
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root  
 ## resource bundle, default is to uppercase the root resource bundle^M  
 ##  
 ##################################  
   
 ifdef ICU_NO_UPPERCASE_ROOT  
   CNV_ROOT_FLAGS =  
 else  
   CNV_ROOT_FLAGS = -u  
 endif  
   
 ####################################  
 ##  
 ## ICU_ROOT_BUNDLE_LANG if set, specifies the language that the root resource  
 ## bundle will be generated from defaults to _en if not set.  if set, for  
 ## any directory containing resource bundles, there must exist a file name:  
 ## package(the value of ICU_ROOT_BUNDLE_LANG).txt or the make messages  
 ## target will fail  
 ##  
 ####################################  
   
 ifdef ICU_ROOT_BUNDLE_LANG  
   MSG_ROOT_SOURCE = $(ICU_ROOT_BUNDLE_LANG)  
 else  
   MSG_ROOT_SOURCE = _en  
 endif  
   
     SYS_INCLUDES += -I${ICU_ROOT}/source/common  
     SYS_INCLUDES += -I${ICU_ROOT}/source/i18n  
     DEFINES += -DPEGASUS_HAS_ICU  
     ifdef ICU_INSTALL  
       EXTRA_LIBRARIES += -L${ICU_INSTALL}/lib -licui18n -licuuc       EXTRA_LIBRARIES += -L${ICU_INSTALL}/lib -licui18n -licuuc
     endif     endif
   endif   endif
 endif  
  
  
 DEPEND_INCLUDES = DEPEND_INCLUDES =
Line 176 
Line 141 
   endif   endif
 else else
   ifdef PEGASUS_HAS_MESSAGES   ifdef PEGASUS_HAS_MESSAGES
     ifdef ICU_ROOT  
       ifdef ICU_INSTALL       ifdef ICU_INSTALL
         FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib         FLAGS += -Wl,+b$(LIB_DIR):/usr/lib:${ICU_INSTALL}/lib
       endif       endif
     endif  
   else   else
     FLAGS += -Wl,+b$(LIB_DIR):/usr/lib     FLAGS += -Wl,+b$(LIB_DIR):/usr/lib
   endif   endif


Legend:
Removed from v.1.45  
changed lines
  Added in v.1.46

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2