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

Diff for /pegasus/Makefile.Release between version 1.69 and 1.75

version 1.69, 2007/08/10 17:57:43 version 1.75, 2007/09/12 20:35:02
Line 108 
Line 108 
    libCertificateProvider \    libCertificateProvider \
    libpegqueryexpression \    libpegqueryexpression \
    libpegquerycommon \    libpegquerycommon \
    libInteropProvider \  
    libCIMOMStatDataProvider \  
    libpegservice    libpegservice
  
 ifndef PEGASUS_DISABLE_CQL ifndef PEGASUS_DISABLE_CQL
Line 644 
Line 642 
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec >> \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec >> \
              $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts              $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
  
 stage_SSLRandomSeedFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release createrandomseed FILENAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_CIMSERVER_RANDOMFILE)  
         $(MAKE) -f $(ROOT)/Makefile.Release createrandomseed FILENAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_WBEMEXEC_RANDOMFILE)  
   
 setpermissions_SSLRandomSeedFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_CIMSERVER_RANDOMFILE)  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_WBEMEXEC_RANDOMFILE)  
   
 stage_ServerCertificateFiles: FORCE  
 ifdef PEGASUS_SSL_RANDOMFILE  
         $(OPENSSL_COMMAND) req -x509 -days 3650 -newkey rsa:2048 -rand $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_CIMSERVER_RANDOMFILE) -nodes -config $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/ssl.cnf -keyout $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE) -out $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)  
 else  
         $(OPENSSL_COMMAND) req -x509 -days 3650 -newkey rsa:2048 -nodes -config $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/ssl.cnf -keyout $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE) -out $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)  
 endif  
   
 setpermissions_ServerCertificateFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE)  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE)  
   
 stage_ClientCertificateFiles: FORCE  
         $(COPY) $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_CERT_FILE) $(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_TRUSTSTORE)  
   
 setpermissions_ClientCertificateFiles: FORCE  
         $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_TRUSTSTORE)  
   
 stage_PegasusDirectories: FORCE stage_PegasusDirectories: FORCE
         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusProductDirectories         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusProductDirectories
         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusSocketDirectory         $(MAKE) -f $(ROOT)/Makefile.Release stage_PegasusSocketDirectory
Line 765 
Line 738 
              >>  $(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 PEGASUS_CIMSERVER_START_LOCK_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) "# undef PEGASUS_PLANNED_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  
         @$(ECHO-E) "# undef PEGASUS_CURRENT_CONFIG_FILE_PATH" \  
              >> $(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) "# undef PEGASUS_CIMSERVER_START_FILE" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_CIMSERVER_START_FILE"  \  
              "\""$(PEGASUS_CIMSERVER_START_FILE)"\"" \  
              >> $(ROOT)/src/Pegasus/Common/ProductDirectoryStructure.h  
         @$(ECHO-E) "# define PEGASUS_REPOSITORY_DIR"  \  
              "\""$(PEGASUS_REPOSITORY_DIR)"\"" \  
              >> $(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 838 
Line 792 
              >>  $(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 998 
Line 904 
              >> $(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 1062 
Line 966 
         @$(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)
Line 1396 
Line 1303 
         @$(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 1410 
Line 1317 
            "$(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.69  
changed lines
  Added in v.1.75
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2