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

Diff for /pegasus/mak/config.mak between version 1.195.2.6 and 1.213

version 1.195.2.6, 2014/05/05 16:47:43 version 1.213, 2014/03/11 03:46:15
Line 33 
Line 33 
 ## ##
 ################################################################################ ################################################################################
  
 #PEGASUS_ROOT is mandatory currently  ifndef ROOT
 ifdef PEGASUS_ROOT  
   ifeq ($(wildcard $(PEGASUS_ROOT)),)  
     $(error PEGASUS_ROOT = $(PEGASUS_ROOT) is incorrect, \  
       Did you meant to set it to $(CURDIR)?)  
   endif  
   ROOT =  $(subst \,/,$(PEGASUS_ROOT))   ROOT =  $(subst \,/,$(PEGASUS_ROOT))
 else  
   $(error PEGASUS_ROOT environment variable undefined)  
 endif endif
  
   
 ifdef PEGASUS_ENVVAR_FILE ifdef PEGASUS_ENVVAR_FILE
     include $(PEGASUS_ENVVAR_FILE)     include $(PEGASUS_ENVVAR_FILE)
 else else
Line 57 
Line 49 
     $(error PEGASUS_HOME environment variable undefined)     $(error PEGASUS_HOME environment variable undefined)
 endif endif
  
   ifdef PEGASUS_ROOT
       ROOT =  $(subst \,/,$(PEGASUS_ROOT))
   else
       $(error PEGASUS_ROOT environment variable undefined)
   endif
  
 ifdef PEGASUS_TMP ifdef PEGASUS_TMP
     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))     TMP_DIR = $(subst \,/,$(PEGASUS_TMP))
Line 74 
Line 71 
      PEGASUS_USE_DEBUG_BUILD_OPTIONS = 1      PEGASUS_USE_DEBUG_BUILD_OPTIONS = 1
 endif endif
  
 PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform*.mak)  PLATFORM_FILES=$(wildcard $(ROOT)/mak/platform_*.mak)
 PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES)) PLATFORM_TEMP=$(subst $(ROOT)/mak/platform_,, $(PLATFORM_FILES))
 VALID_PLATFORMS=$(subst .mak,  , $(PLATFORM_TEMP)) VALID_PLATFORMS=$(subst .mak,  , $(PLATFORM_TEMP))
  


Legend:
Removed from v.1.195.2.6  
changed lines
  Added in v.1.213

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2