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

Diff for /pegasus/mak/commands.mak between version 1.50.2.3 and 1.52

version 1.50.2.3, 2006/12/29 22:22:03 version 1.52, 2007/01/11 16:21:52
Line 44 
Line 44 
     include $(ROOT)/mak/config.mak     include $(ROOT)/mak/config.mak
 endif endif
  
 ifeq ($(OS),win32)  ifeq ($(OS_TYPE),windows)
     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)     STRIPCRS = stripcrs $(RESULTFILE) $(MASTERRESULTFILE)
     DIFF = mu compare     DIFF = mu compare
     SORT = mu sort     SORT = mu sort
Line 295 
Line 295 
     STRIPCRS =     STRIPCRS =
     DIFF = diff     DIFF = diff
     SORT = sort     SORT = sort
     REDIRECTERROR =      REDIRECTERROR = 2>&1
     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)     CIMSERVER_START_SERVICE = $(CIMSERVER_PATH)cimserver $(CIMSERVER_CONFIG_OPTIONS)
     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s     CIMSERVER_STOP_SERVICE = $(CIMSERVER_PATH)cimserver -s
     SLEEP = sleep     SLEEP = sleep
Line 347 
Line 347 
 endif endif
  
 ifdef PEGASUS_ENABLE_REMOTE_CMPI ifdef PEGASUS_ENABLE_REMOTE_CMPI
     ifeq ($(OS),win32)      ifeq ($(OS_TYPE),windows)
         $(error Error: Remote CMPI is not currently supported on Windows.)         $(error Error: Remote CMPI is not currently supported on Windows.)
     else     else
         CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon         CMPIR_START_DAEMON = $(CIMSERVER_PATH)CMPIRDaemon

Legend:
Removed from v.1.50.2.3  
changed lines
  Added in v.1.52
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2