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

Diff for /pegasus/mak/config-linux.mak between version 1.15 and 1.22

version 1.15, 2004/06/29 20:38:12 version 1.22, 2004/08/24 21:34:19
Line 12 
Line 12 
  
 PLATFORM_VERSION_SUPPORTED = yes PLATFORM_VERSION_SUPPORTED = yes
  
   ifndef CXX
 CXX = g++ CXX = g++
   endif
  
 SH = sh SH = sh
  
Line 42 
Line 44 
  
 # Build using fixed release settings # Build using fixed release settings
 # #
 ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  
 FLAGS += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS  
 endif  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
 FLAGS += -DPEGASUS_USE_RELEASE_DIRS    PEGASUS_DEST_LIB_DIR=/opt/tog-pegasus/lib
 endif endif
  
 # PAM support # PAM support
Line 67 
Line 66 
  
  
 ifdef PEGASUS_DEBUG ifdef PEGASUS_DEBUG
 FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT -DPEGASUS_DEBUG  FLAGS += -g -fPIC -W -Wall -Wno-unused  -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
 else else
 FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT FLAGS += -O2 -fPIC -W -Wall -Wno-unused -D_GNU_SOURCE -DTHREAD_SAFE -D_REENTRANT
 endif endif
  
 ifdef PEGASUS_HAS_PERFINST  
   FLAGS += -DPEGASUS_HAS_PERFINST  
 endif  
   
 ifndef PEGASUS_USE_MU_DEPEND ifndef PEGASUS_USE_MU_DEPEND
 PEGASUS_HAS_MAKEDEPEND = yes PEGASUS_HAS_MAKEDEPEND = yes
 endif endif
Line 101 
Line 96 
 ################################## ##################################
 ## ##
 ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle, ## ICU_NO_UPPERCASE_ROOT if set, specifies NOT to uppercase the root resource bundle,
 ## default is to uppercase the root resource bundle  ## default is to uppercase the root resource bundle##
 ##  
 ################################## ##################################
  
 ifdef ICU_NO_UPPERCASE_ROOT ifdef ICU_NO_UPPERCASE_ROOT
Line 139 
Line 133 
 #################################### ####################################
  
 ifdef PEGASUS_LSB ifdef PEGASUS_LSB
     SYS_INCLUDES += -I/usr/include -I/usr/include/c++      SYS_INCLUDES += -I/usr/include -I/usr/include/c++ -I/opt/lsbdev-base/include/c++ -I/opt/lsbdev-base/include/
     FLAGS += -DPEGASUS_OS_LSB     FLAGS += -DPEGASUS_OS_LSB
     ## This name is hard-coded in the config files. Change accordingly.  
     PEGASUS_LSB_NAME = pegasus-lsb  
     PREFIX = /opt  
     SYSCONF_PREFIX = /etc/opt  
     LOCAL_STATE_PREFIX = /var/opt/  
     DEST_LIB_DIR = $(PREFIX)/$(PEGASUS_LSB_NAME)/lib  
     DEST_BIN_DIR = $(PREFIX)/$(PEGASUS_LSB_NAME)/bin  
     DEST_SBIN_DIR = $(PREFIX)/$(PEGASUS_LSB_NAME)/sbin  
     DEST_ETC_DIR = $(SYSCONF_PREFIX)/$(PEGASUS_LSB_NAME)/  
     DEST_MAN_DIR = $(PREFIX)/$(PEGASUS_LSB_NAME)/man  
     DEST_VAR_DIR = $(LOCAL_STATE_PREFIX)/$(PEGASUS_LSB_NAME)/  
     REPOSITORY_DIR = $(LOCAL_STATE_PREFIX)/$(PEGASUS_LSB_NAME)/repository  
 endif endif
  

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.22
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2