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

Diff for /pegasus/mak/config.mak between version 1.188.2.2 and 1.189

version 1.188.2.2, 2010/08/10 12:23:34 version 1.189, 2010/06/17 10:44:05
Line 223 
Line 223 
 # ***** # *****
  
 ifndef PEGASUS_CIM_SCHEMA ifndef PEGASUS_CIM_SCHEMA
     PEGASUS_CIM_SCHEMA=CIM222      PEGASUS_CIM_SCHEMA=CIM225
 endif endif
  
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA) CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)
Line 1239 
Line 1239 
 # #
 RMREPOSITORY = $(RMDIRHIER) RMREPOSITORY = $(RMDIRHIER)
  
 ifndef PEGASUS_USE_RELEASE_CONFIG_OPTIONS  ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
    PEGASUS_USE_RELEASE_CONFIG_OPTIONS=false  
 endif  
   
 ifeq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),true)  
    DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS    DEFINES += -DPEGASUS_USE_RELEASE_CONFIG_OPTIONS
 else  
    ifneq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),false)  
       $(error PEGASUS_USE_RELEASE_CONFIG_OPTIONS \  
           ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS)) invalid, must be true or false)  
    endif  
 endif endif
  
 ifdef PEGASUS_USE_RELEASE_DIRS ifdef PEGASUS_USE_RELEASE_DIRS
Line 1498 
Line 1489 
       DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"       DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
   endif   endif
 endif endif
   
 ifdef PEGASUS_EXTRA_PROVIDER_LIB_DIR  
    ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS  
       $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when PEGASUS_EXTRA_PROVIDER_LIB_DIR defined.")  
    endif  
    DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"$(PEGASUS_EXTRA_PROVIDER_LIB_DIR):\"  
 else  
    DEFINES += -DPEGASUS_EXTRA_PROVIDER_LIB_DIR=\"\"  
 endif  
   


Legend:
Removed from v.1.188.2.2  
changed lines
  Added in v.1.189

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2