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

Diff for /pegasus/mak/config.mak between version 1.1 and 1.2

version 1.1, 2001/01/14 19:50:21 version 1.2, 2001/01/29 07:03:47
Line 11 
Line 11 
   OS_TYPE = windows   OS_TYPE = windows
 endif endif
  
 ifdef PEGASUS_BUILD  ifdef PEGASUS_HOME
   BUILD_DIR = $(subst \,/,$(PEGASUS_BUILD))    HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
   BUILD_DIR = $(ROOT)/build    ERROR = pegasus_home_undefined
   pegasus_home_undefined:
           @ echo PEGASUS_HOME environment variable undefined
           @ exit 1
 endif endif
  
 ifdef PEGASUS_ACE_ROOT ifdef PEGASUS_ACE_ROOT
   ACE_ROOT = $(subst \,/,$(PEGASUS_ACE_ROOT))   ACE_ROOT = $(subst \,/,$(PEGASUS_ACE_ROOT))
 else else
   ERROR = PEGASUS_ACE_ROOT_UNDEFINED    ERROR = pegasus_ace_root_undefined
 PEGASUS_ACE_ROOT_UNDEFINED:  pegasus_ace_root_undefined:
         @ echo PEGASUS_ACE_ROOT environment variable undefined         @ echo PEGASUS_ACE_ROOT environment variable undefined
         @ exit 1         @ exit 1
 endif endif
Line 29 
Line 32 
  
 ################################################################################ ################################################################################
  
 OBJ_DIR = $(BUILD_DIR)/obj/$(DIR)  OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
 BIN_DIR = $(BUILD_DIR)/bin  BIN_DIR = $(HOME_DIR)/bin
 LIB_DIR = $(BUILD_DIR)/lib  LIB_DIR = $(HOME_DIR)/lib
 REPOSITORY_ROOT = $(BUILD_DIR)  REPOSITORY_ROOT = $(HOME_DIR)
  
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 include $(ROOT)/mak/config-windows.mak include $(ROOT)/mak/config-windows.mak


Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2