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

Diff for /pegasus/mak/config.mak between version 1.48 and 1.57

version 1.48, 2004/05/13 13:10:46 version 1.57, 2004/08/02 19:37:16
Line 5 
Line 5 
 ## ##
 ################################################################################ ################################################################################
  
   ifndef ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   endif
   
   include $(ROOT)/env_var.status
   
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
Line 128 
Line 134 
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))   CIM_SCHEMA_VER=$(patsubst CIM%,%,$(patsubst CIMPrelim%,%,$(PEGASUS_CIM_SCHEMA)))
 else else
   CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM27    CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM28
   CIM_SCHEMA_VER=27    CIM_SCHEMA_VER=28
 endif endif
  
 ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR))) ifneq (, $(findstring Prelim, $(CIM_SCHEMA_DIR)))
Line 142 
Line 148 
  
 ################################################################################ ################################################################################
 ## ##
   ## Default installation paths
   ##
   ################################################################################
   
   ## Default values to install files when 'make install' is invoked.
   
   ifndef PREFIX
   PREFIX=$(HOME_DIR)/install
   endif
   
   ifndef SYSCONF_PREFIX
   SYSCONF_PREFIX=$(PREFIX)/etc
   endif
   
   ifndef LOCAL_STATE_PREFIX
   LOCAL_STATE_PREFIX=$(PREFIX)/var/
   endif
   
   ifndef DEST_LIB_DIR
   DEST_LIB_DIR = $(PREFIX)/lib
   endif
   
   ifndef DEST_BIN_DIR
   DEST_BIN_DIR = $(PREFIX)/bin
   endif
   
   ifndef DEST_SBIN_DIR
   DEST_SBIN_DIR = $(PREFIX)/sbin
   endif
   
   ifndef DEST_ETC_DIR
   DEST_ETC_DIR = $(SYSCONF_PREFIX)/pegasus
   endif
   
   ifndef DEST_MAN_DIR
   DEST_MAN_DIR = $(PREFIX)/man
   endif
   
   ifndef DEST_VAR_DIR
   DEST_VAR_DIR = $(LOCAL_STATE_PREFIX)
   endif
   
   ################################################################################
   ##
 ## Attempt to include a platform configuration file: ## Attempt to include a platform configuration file:
 ## ##
 ################################################################################ ################################################################################
Line 226 
Line 276 
  
 ################################################################################ ################################################################################
 ## ##
   ## Default installation macros
   ##
   ################################################################################
   
   ## INSTALL_LIB creates the destination directory if missing,
   ## copies the library and generates the symbolic link.
   
   ifndef INSTALL_LIBRARY
   ## These macros are also defined in the Platform_<*>.mak files.
   INSTALL_LIBRARY =  $(MKDIRHIER) $(DEST_LIB_DIR); $(COPY) $(FULL_LIB) $(DEST_LIB_DIR)
   endif
   
   ## INSTALL_PROGRAM creates the destination directory if missing and
   ## copies the file.
   ifndef INSTALL_PROGRAM
   INSTALL_PROGRAM = $(MKDIRHIER) $(DEST_BIN_DIR); $(COPY) $(FULL_PROGRAM) $(DEST_BIN_DIR)
   endif
   ## INSTALL_PROGRAM creates the destination directory if missing and
   ## copies the file.
   ifndef INSTALL_SBIN_PROGRAM
   INSTALL_SBIN_PROGRAM = $(MKDIRHIER) $(DEST_SBIN_DIR);  $(COPY) $(FULL_PROGRAM) $(DEST_SBIN_DIR)
   endif
   ## The rest of the macros for DEST_MAN_DIR, DEST_VAR_DIR, etc. are not provided in this file.
   
   ################################################################################
   ##
 ##  Set up any platform independent compile conditionals by adding them to ##  Set up any platform independent compile conditionals by adding them to
 ##  precreated FLAGS parameter. ##  precreated FLAGS parameter.
 ##  Assumes that the basic flags have been setup in FLAGS. ##  Assumes that the basic flags have been setup in FLAGS.
Line 265 
Line 341 
         endif         endif
 endif endif
  
 # is the pegasus slp classes  #
 ifdef PEGASUS_SLP_CLASSES  # PEP 142
         DEFINES+= -DPEGASUS_SLP_CLASSES  # The following flag need to be set to enable
   # user group authorization functionality.
   #
   ifdef PEGASUS_ENABLE_USERGROUP_AUTHORIZATION
    DEFINES += -DPEGASUS_ENABLE_USERGROUP_AUTHORIZATION
 endif endif
  
   
 # setup function to enable SLP functions in the Pegasus standard compile # setup function to enable SLP functions in the Pegasus standard compile
 # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code. # Set the environment varaible PEGASUS_ENABLE_SLP to enable SLP code.
 ifdef PEGASUS_ENABLE_SLP ifdef PEGASUS_ENABLE_SLP
Line 279 
Line 360 
 # compile in the experimental APIs # compile in the experimental APIs
 DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES DEFINES+= -DPEGASUS_USE_EXPERIMENTAL_INTERFACES
  
   # Set compile flag to control compilation of CIMOM statistics
   ifdef PEGASUS_HAS_PERFINST
     FLAGS += -DPEGASUS_HAS_PERFINST
   endif
   
   ############################################################
   #
   # Set any vendor-specific compile flags
   #
   ############################################################
   
   ifdef PEGASUS_VENDOR_HP
     DEFINES+= -DPEGASUS_VENDOR_HP
   endif
   
  
 ############################################################ ############################################################
 # #


Legend:
Removed from v.1.48  
changed lines
  Added in v.1.57

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2