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

Diff for /pegasus/mak/config.mak between version 1.5 and 1.7

version 1.5, 2001/03/04 21:36:38 version 1.7, 2001/04/13 20:54:15
Line 5 
Line 5 
 ## ##
 ################################################################################ ################################################################################
  
 ifdef PEGASUS_OS_TYPE  
   OS_TYPE = $(PEGASUS_OS_TYPE)  
 else  
   OS_TYPE = windows  
 endif  
   
 ifdef PEGASUS_HOME ifdef PEGASUS_HOME
   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))   HOME_DIR = $(subst \,/,$(PEGASUS_HOME))
 else else
Line 20 
Line 14 
         @ exit 1         @ exit 1
 endif endif
  
 ifdef PEGASUS_ACE_ROOT  
   ACE_ROOT = $(subst \,/,$(PEGASUS_ACE_ROOT))  
 else  
   ERROR = pegasus_ace_root_undefined  
 pegasus_ace_root_undefined:  
         @ echo PEGASUS_ACE_ROOT environment variable undefined  
         @ exit 1  
 endif  
   
   
 ################################################################################ ################################################################################
  
 OBJ_DIR = $(HOME_DIR)/obj/$(DIR) OBJ_DIR = $(HOME_DIR)/obj/$(DIR)
Line 41 
Line 25 
  
 YACC = bison YACC = bison
  
 ifeq ($(OS_TYPE),windows)  include $(ROOT)/mak/config-platform.mak
 include $(ROOT)/mak/config-windows.mak  
 else  
 include $(ROOT)/mak/config-unix.mak  
 endif  


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.7

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2