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

Diff for /pegasus/Makefile.Release between version 1.60 and 1.74

version 1.60, 2006/11/29 21:40:26 version 1.74, 2007/09/12 20:23:46
Line 108 
Line 108 
    libCertificateProvider \    libCertificateProvider \
    libpegqueryexpression \    libpegqueryexpression \
    libpegquerycommon \    libpegquerycommon \
    libInteropProvider \  
    libCIMOMStatDataProvider \  
    libpegservice    libpegservice
  
 ifndef PEGASUS_DISABLE_CQL ifndef PEGASUS_DISABLE_CQL
Line 124 
Line 122 
    libcmpiCppImpl    libcmpiCppImpl
 endif endif
  
   ifdef PEGASUS_USE_NET_SNMP
      PEGASUS_LIBRARIES += \
         libsnmpIndicationHandler
   endif
   
 ifeq ($(OS),HPUX) ifeq ($(OS),HPUX)
 PEGASUS_LIBRARIES += \ PEGASUS_LIBRARIES += \
    libNTPProviderSecurity    libNTPProviderSecurity
Line 141 
Line 144 
    libCMPIProviderManager    libCMPIProviderManager
 endif endif
  
   ifdef PEGASUS_USE_NET_SNMP
   PEGASUS_LIBRARY_LINKS += \
      libsnmpIndicationHandler
   endif
   
 PEGASUS_PROVIDERS = \ PEGASUS_PROVIDERS = \
    libComputerSystemProvider \    libComputerSystemProvider \
    libOSProvider \    libOSProvider \
Line 161 
Line 169 
    cimprovagt \    cimprovagt \
    cimservera \    cimservera \
    cimreparchive \    cimreparchive \
    repupgrade \     cimtrust \
    cimsub     repupgrade
   
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
      PEGASUS_ADMIN_CMDS += \
         cimservermain \
         cimshutdown
   endif
  
 PEGASUS_USER_CMDS = \ PEGASUS_USER_CMDS = \
    cimmof \    cimmof \
    cimmofl \    cimmofl \
    cimprovider \    cimprovider \
      cimsub \
    osinfo \    osinfo \
    wbemexec    wbemexec
  
Line 202 
Line 217 
    cimauth.8 \    cimauth.8 \
    cimconfig.8 \    cimconfig.8 \
    cimreparchive.8 \    cimreparchive.8 \
      cimtrust.8 \
    cimserver.8    cimserver.8
  
 PEGASUS_DOC_FILES = \ PEGASUS_DOC_FILES = \
Line 491 
Line 507 
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
  
 setpermissions_PegasusSocketDirectory: FORCE setpermissions_PegasusSocketDirectory: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
   
   stage_PegasusVarRunDirectory: FORCE
           $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_VARRUN_DIR)
   
   setpermissions_PegasusVarRunDirectory: FORCE
           $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARRUN_DIR)
  
 stage_PegasusLocalAuthDirectory: FORCE stage_PegasusLocalAuthDirectory: FORCE
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)
Line 540 
Line 562 
         $(CPDIRHIER) $(NAMESPACE_DIR_NAME) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)         $(CPDIRHIER) $(NAMESPACE_DIR_NAME) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)
  
 setpermissions_RepositoryNamespaceDirectory: FORCE setpermissions_RepositoryNamespaceDirectory: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers
  
 stage_PegasusRepositoryDirectories: FORCE stage_PegasusRepositoryDirectories: FORCE
         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
Line 554 
Line 576 
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(PEGASUS_HOME)/repository -f $(ROOT)/Makefile.Release stage_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(PEGASUS_HOME)/repository -f $(ROOT)/Makefile.Release stage_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)
  
 setpermissions_PegasusRepositoryDirectories: FORCE setpermissions_PegasusRepositoryDirectories: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)          $(MAKE) -f $(ROOT)/Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)
  
 stage_PegasusUnixManPageDirectoryFiles: FORCE stage_PegasusUnixManPageDirectoryFiles: FORCE
Line 597 
Line 619 
         $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)         $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
  
 setpermissions_PegasusVarDataDirectoryFiles: FORCE setpermissions_PegasusVarDataDirectoryFiles: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
  
 stage_genOpenPegasusSSLCertsFile: FORCE stage_genOpenPegasusSSLCertsFile: FORCE
         @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts         @$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
Line 700 
Line 722 
 setpermissions_PegasusSystemFiles: FORCE setpermissions_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux) ifeq ($(OS),linux)
 ifdef PEGASUS_PAM_AUTHENTICATION ifdef PEGASUS_PAM_AUTHENTICATION
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf
 endif endif
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(CIMSERVER_USR)" GROUP="$(CIMSERVER_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/tog-pegasus          $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/tog-pegasus
 endif endif
  
 stage_PegasusEmptyFiles: FORCE stage_PegasusEmptyFiles: FORCE
Line 741 
Line 763 
              >>  $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >>  $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSLCLIENT_CERTIFICATEFILE" \          @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_FILE"  \
                "\""$(PEGASUS_CIMSERVER_START_FILE)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_LOCK_FILE"  \
                "\""$(PEGASUS_CIMSERVER_START_LOCK_FILE)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \
                "\""$(PEGASUS_REPOSITORY_DIR)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_CURRENT_CONFIG_FILE_PATH"  \
                "\""$(PEGASUS_CURRENT_CONFIG_FILE_PATH)"\"" \
                >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
           @$(ECHO-E) "# define PEGASUS_PLANNED_CONFIG_FILE_PATH"  \
                "\""$(PEGASUS_PLANNED_CONFIG_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_CERTIFICATEFILE"  \         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_CERTIFICATEFILE"  \
              "\""$(PEGASUS_SSL_CLIENT_TRUSTSTORE)"\"" \              "\""$(PEGASUS_SSL_CLIENT_TRUSTSTORE)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSLCLIENT_RANDOMFILE" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_RANDOMFILE"  \         @$(ECHO-E) "# define PEGASUS_SSLCLIENT_RANDOMFILE"  \
              "\""$(PEGASUS_VARDATA_DIR)/ssl.rnd"\"" \              "\""$(PEGASUS_VARDATA_DIR)/ssl.rnd"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_LOCAL_AUTH_DIR" \          @$(ECHO-E) "# define PEGASUS_SSLSERVER_RANDOMFILE"  \
                "\""$(PEGASUS_VARDATA_DIR)/cimserver.rnd"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# define PEGASUS_LOCAL_AUTH_DIR"  \         @$(ECHO-E) "# define PEGASUS_LOCAL_AUTH_DIR"  \
              "\""$(PEGASUS_LOCAL_AUTH_DIR)"\"" \              "\""$(PEGASUS_LOCAL_AUTH_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_LOCAL_DOMAIN_SOCKET_PATH" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH"  \         @$(ECHO-E) "# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH"  \
              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \              "\""$(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_CORE_DIR" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \         @$(ECHO-E) "# define PEGASUS_CORE_DIR"  \
              "\""$(PEGASUS_VARDATA_CACHE_DIR)"\"" \              "\""$(PEGASUS_VARDATA_CACHE_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PAM_STANDALONE_PROC_NAME" \  
              >> $(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"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PROVIDER_AGENT_PROC_NAME" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_AGENT_PROC_NAME"  \
              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \              "\""$(PEGASUS_SBIN_DIR)/cimprovagt"\"" \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef CIMSERVER_LOCK_FILE" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define CIMSERVER_LOCK_FILE"  \  
              "\""$(CIMSERVER_LOCK_FILE)"\"" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h
         @$(ECHO-E) "#endif /* Common_Product_Directory_Structure_h */ " \         @$(ECHO-E) "#endif /* Common_Product_Directory_Structure_h */ " \
Line 796 
Line 817 
              >>  $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >>  $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PLANNED_CONFIG_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_PLANNED_CONFIG_FILE_PATH"  \  
              "\""$(PEGASUS_PLANNED_CONFIG_FILE_PATH)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_CURRENT_CONFIG_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CURRENT_CONFIG_FILE_PATH"  \  
              "\""$(PEGASUS_CURRENT_CONFIG_FILE_PATH)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_CIMSERVER_START_FILE" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_FILE"  \  
              "\""$(PEGASUS_CIMSERVER_START_FILE)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_LOG_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_LOG_DIR"  \         @$(ECHO-E) "# define PEGASUS_LOG_DIR"  \
              "\""$(PEGASUS_LOG_DIR)"\"" \              "\""$(PEGASUS_LOG_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_TRACE_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_TRACE_FILE_PATH"  \         @$(ECHO-E) "# define PEGASUS_TRACE_FILE_PATH"  \
              "\""$(PEGASUS_TRACE_FILE_PATH)"\"" \              "\""$(PEGASUS_TRACE_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_CONFIG_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CONFIG_DIR"  \         @$(ECHO-E) "# define PEGASUS_CONFIG_DIR"  \
              "\""$(PEGASUS_CONFIG_DIR)"\"" \              "\""$(PEGASUS_CONFIG_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_CERT_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_CERT_FILE_PATH"  \         @$(ECHO-E) "# define PEGASUS_SSL_CERT_FILE_PATH"  \
              "\""$(PEGASUS_SSL_CERT_FILE_PATH)"\"" \              "\""$(PEGASUS_SSL_CERT_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_KEY_FILE_PATH" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_KEY_FILE_PATH"  \         @$(ECHO-E) "# define PEGASUS_SSL_KEY_FILE_PATH"  \
              "\""$(PEGASUS_SSL_KEY_FILE_PATH)"\"" \              "\""$(PEGASUS_SSL_KEY_FILE_PATH)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_SERVER_TRUSTSTORE" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_TRUSTSTORE"  \         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_TRUSTSTORE"  \
              "\""$(PEGASUS_SSL_SERVER_TRUSTSTORE)"\"" \              "\""$(PEGASUS_SSL_SERVER_TRUSTSTORE)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_SSL_EXPORT_TRUSTSTORE" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_EXPORT_TRUSTSTORE"  \  
              "\""$(PEGASUS_SSL_EXPORT_TRUSTSTORE)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_SSL_SERVER_CRL" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_CRL"  \         @$(ECHO-E) "# define PEGASUS_SSL_SERVER_CRL"  \
              "\""$(PEGASUS_SSL_SERVER_CRL)"\"" \              "\""$(PEGASUS_SSL_SERVER_CRL)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_REPOSITORY_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \  
              "\""$(PEGASUS_REPOSITORY_DIR)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# undef PEGASUS_PREV_REPOSITORY_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_PREV_REPOSITORY_DIR"  \         @$(ECHO-E) "# define PEGASUS_PREV_REPOSITORY_DIR"  \
              "\""$(PEGASUS_PREV_REPOSITORY_DIR)"\"" \              "\""$(PEGASUS_PREV_REPOSITORY_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_PROVIDER_LIB_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_PROVIDER_LIB_DIR"  \         @$(ECHO-E) "# define PEGASUS_PROVIDER_LIB_DIR"  \
              "\""$(PEGASUS_PROVIDER_LIB_DIR)"\"" \              "\""$(PEGASUS_PROVIDER_LIB_DIR)"\"" \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "# undef PEGASUS_MESSAGE_DIR" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_MESSAGE_DIR"  \  
              "\""$(PEGASUS_MESSAGE_DIR)"\"" \  
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h  
         @$(ECHO-E) " " \         @$(ECHO-E) " " \
              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h              >> $(ROOT)/src/Pegasus/Config/ProductDirectoryStructure.h
         @$(ECHO-E) "#endif /* Config_Product_Directory_Structure_h */ " \         @$(ECHO-E) "#endif /* Config_Product_Directory_Structure_h */ " \
Line 956 
Line 929 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_SSL_SERVER_TRUSTSTORE)" \         @$(ECHO-E) "ls -ld $(PEGASUS_SSL_SERVER_TRUSTSTORE)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_SSL_EXPORT_TRUSTSTORE)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS CONF FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS CONF FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_CONFIG_DIR)/ssl.cnf*" \         @$(ECHO-E) "ls -ld $(PEGASUS_CONFIG_DIR)/ssl.cnf*" \
Line 1020 
Line 991 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
 _append_PreambleToSpecFile: FORCE _append_PreambleToSpecFile: FORCE
           @$(ECHO-E) "%define packageVersion $(PEGASUS_PACKAGE_VERSION)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \         @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Release: 1%{?LINUX_VERSION:.%{LINUX_VERSION}}" \          @$(ECHO-E) "Release:"\
               "%{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "Epoch:   1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "Epoch:   1" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-intro.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)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-buildRequires.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_USE_NET_SNMP
           @$(ECHO-E) "BuildRequires:      net-snmp-devel" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# End of section " \
               "pegasus/rpm/tog-specfiles/tog-pegasus-buildRequires.spec" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_USE_NET_SNMP
           @$(ECHO-E) "Requires:           net-snmp" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "#" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# End of section " \
               "pegasus/rpm/tog-specfiles/tog-pegasus-requires.spec" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-desc.spec \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.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)
Line 1061 
Line 1060 
         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \         @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_FILE" \
              "$(PEGASUS_CIMSERVER_START_FILE)"  \              "$(PEGASUS_CIMSERVER_START_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global CIMSERVER_LOCK_FILE" \          @$(ECHO-E) "%global PEGASUS_TRACE_FILE_PATH" \
              "$(CIMSERVER_LOCK_FILE)"  \               "$(PEGASUS_TRACE_FILE_PATH)"  \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%global PEGASUS_CIMSERVER_START_LOCK_FILE" \
                "$(PEGASUS_CIMSERVER_START_LOCK_FILE)"  \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \         @$(ECHO-E) "%global PEGASUS_REPOSITORY_DIR $(PEGASUS_REPOSITORY_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1084 
Line 1086 
              "\044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION"\              "\044RPM_BUILD_DIR/\044RPM_PACKAGE_NAME-\044RPM_PACKAGE_VERSION"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) \         @$(ECHO-E) \
              "%global PEGASUS_RPM_HOME \044RPM_BUILD_ROOT/build/tog-pegasus"\               "%global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\         @$(ECHO-E) "%global PEGASUS_INSTALL_LOG $(PEGASUS_LOG_DIR)/install.log"\
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1124 
Line 1126 
         @$(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
           @$(ECHO-E) "# When Privilege Separation is enabled, create the" \
               "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
               "as the context of the cimservermain process" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "if [ \044\061 -gt 0 ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/groupadd $(CIMSERVERMAIN_GRP) > /dev/null" \
               "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/useradd -c \"tog-pegasus OpenPegasus"\
               "WBEM/CIM services\" \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "        -g $(CIMSERVERMAIN_GRP) -s /sbin/nologin -r -d" \
               "%PEGASUS_VARDATA_DIR $(CIMSERVERMAIN_USR) \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "        > /dev/null 2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
  
 _append_postSectionToSpecFile: FORCE _append_postSectionToSpecFile: FORCE
         @$(ECHO-E) "%post" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%post" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1146 
Line 1166 
         @$(ECHO-E) "     %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \         @$(ECHO-E) "     %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   /etc/init.d/tog-pegasus condrestart" \          @$(ECHO-E) "   # Check if the cimserver is running" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   isRunning=\`ps -el | grep cimserver | grep -v" \
               "\"grep cimserver\"\`" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       /etc/init.d/tog-pegasus stop" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
           @$(ECHO-E) "   if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "     /bin/mv %PEGASUS_TRACE_FILE_PATH" \
            "%PEGASUS_TRACE_FILE_PATH-\`date '+%Y-%m-%d-%R'\`" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "   :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)          @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
           @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "       /etc/init.d/tog-pegasus start" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  
Line 1201 
Line 1241 
         @$(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
           @$(ECHO-E) "# When Privilege Separation is enabled, delete the" \
               "'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
               "as the context of the cimservermain process" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "if [ \044\061 -eq 0 ]; then" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/userdel $(CIMSERVERMAIN_USR) > /dev/null" \
               "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "    /usr/sbin/groupdel $(CIMSERVERMAIN_GRP) > /dev/null" \
               "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "fi"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
   endif
  
 # %defattr(file permissions, owner, group, directory permissions) # %defattr(file permissions, owner, group, directory permissions)
 # The %ghost directive instructs RPM not to install the specified file(s). # The %ghost directive instructs RPM not to install the specified file(s).
Line 1210 
Line 1265 
  
 _append_filesSectionToSpecFile: FORCE _append_filesSectionToSpecFile: FORCE
         @$(ECHO-E) "%files" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "%files" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%defattr($(Prw_______), $(CIMSERVERMAIN_USR),"\
                "$(CIMSERVERMAIN_GRP), $(Prwx______))" \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%defattr($(Prw_______), $(INSTALL_USR),"\         @$(ECHO-E) "%defattr($(Prw_______), $(INSTALL_USR),"\
              "$(INSTALL_GRP), $(Prwxr_xr_x))" \              "$(INSTALL_GRP), $(Prwxr_xr_x))" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1218 
Line 1277 
              if [ $(i) != $(PEGASUS_REPOSITORY_DIR) ]; then \              if [ $(i) != $(PEGASUS_REPOSITORY_DIR) ]; then \
              if [ $(i) != $(PEGASUS_TRACE_DIR) ]; then \              if [ $(i) != $(PEGASUS_TRACE_DIR) ]; then \
              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \
                if [ $(i) != $(PEGASUS_VARRUN_DIR) ]; then \
                    $(ECHO-E) "%dir $(i)" >> \                    $(ECHO-E) "%dir $(i)" >> \
              $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi;)               $(PEGASUS_RPM_SPEC_FILE_PATH); fi; fi; fi; fi; fi;)
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \         @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \          @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVER_USR)," \
              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr(1555,$(CIMSERVER_USR),$(CIMSERVER_GRP))" \          @$(ECHO-E) "%dir %attr($(Prwxr_xr_x), $(CIMSERVERMAIN_USR)," \
                "$(CIMSERVERMAIN_GRP)) $(PEGASUS_VARRUN_DIR)" \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir %attr(1755,$(CIMSERVERMAIN_USR),$(CIMSERVERMAIN_GRP))" \
              "$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \              "$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%dir %attr($(Prwxrwxrwt),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%dir %attr($(Prwxr_x___), $(CIMSERVER_USR)," \  
              "$(CIMSERVER_GRP)) $(PEGASUS_REPOSITORY_DIR)" \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_REPOSITORY_DIR)/*" \  
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/*" \         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)/*" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/Pegasus/*" \         @$(ECHO-E) "$(PEGASUS_MOF_DIR)/Pegasus/*" \
Line 1246 
Line 1304 
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\         @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)             "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config(noreplace)" \          @$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \
               "$(CIMSERVER_USR), $(CIMSERVER_GRP))" \
             "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \             "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \         @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
Line 1269 
Line 1328 
         @$(ECHO-E) "%ghost $(PEGASUS_INSTALL_LOG)" \         @$(ECHO-E) "%ghost $(PEGASUS_INSTALL_LOG)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \          @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_SBIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SBIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_BIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1283 
Line 1342 
            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_MANUSER_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_MANUSER_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prw_r_____),$(INSTALL_USR),$(INSTALL_GRP))" \          @$(ECHO-E) "%attr($(Prw_r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_MANADMIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_MANADMIN_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_DOC_FILES), \         @$(foreach i, $(PEGASUS_DOC_FILES), \

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