(file) Return to Makefile.Release CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.Release between version 1.86.12.2 and 1.87

version 1.86.12.2, 2008/11/19 23:43:43 version 1.87, 2008/08/19 17:47:14
Line 119 
Line 119 
       libCIMQueryCapabilitiesProvider       libCIMQueryCapabilitiesProvider
 endif endif
  
 ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER  ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libcmpiCppImpl    libcmpiCppImpl
 PEGASUS_PROVIDER_MANAGERS += \ PEGASUS_PROVIDER_MANAGERS += \
Line 172 
Line 172 
    cimtrust \    cimtrust \
    repupgrade    repupgrade
  
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
    PEGASUS_ADMIN_CMDS += \    PEGASUS_ADMIN_CMDS += \
       cimservermain \       cimservermain \
       cimshutdown       cimshutdown
Line 530 
Line 530 
              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \
              "\""$(PEGASUS_CORE_DIR)"\"" \               "\""$(PEGASUS_VARDATA_CACHE_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_PAM_STANDALONE_PROC_NAME"  \         @$(ECHO-E) "# define PEGASUS_PAM_STANDALONE_PROC_NAME"  \
              "\""$(PEGASUS_SBIN_DIR)/cimservera"\"" \              "\""$(PEGASUS_SBIN_DIR)/cimservera"\"" \
Line 875 
Line 875 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-pre.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-pre.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "# When Privilege Separation is enabled, create the" \         @$(ECHO-E) "# When Privilege Separation is enabled, create the" \
             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
Line 926 
Line 926 
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "       %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \         @$(ECHO-E) "       %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "       chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \         @$(ECHO-E) "       chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "       chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \         @$(ECHO-E) "       chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 endif endif
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "   if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \         @$(ECHO-E) "   if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "     /bin/mv %PEGASUS_TRACE_FILE_PATH" \         @$(ECHO-E) "     /bin/mv %PEGASUS_TRACE_FILE_PATH" \
Line 1006 
Line 1006 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-postun.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-postun.spec \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION  ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
         @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \         @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \
             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)             "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \         @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \

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