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

Diff for /pegasus/Makefile.Release between version 1.51 and 1.52

version 1.51, 2006/01/13 20:50:24 version 1.52, 2006/01/24 19:28:51
Line 472 
Line 472 
 stage_PegasusProductDirectories: FORCE stage_PegasusProductDirectories: FORCE
         $(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)         $(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)
         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(i);)
           $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)
           $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)
           $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)
  
 setpermissions_PegasusProductDirectories: FORCE setpermissions_PegasusProductDirectories: FORCE
         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(i);)         $(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(i);)
           $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)
           $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)
  
 stage_PegasusSocketDirectory: FORCE stage_PegasusSocketDirectory: FORCE
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
Line 857 
Line 862 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), \         @$(foreach i, $(PEGASUS_SYSTEM_DIRECTORIES), \
              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
           @$(ECHO-E) "ls -ld $(PEGASUS_DEST_LIB_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS-SPECIFIC DIRECTORIES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS-SPECIFIC DIRECTORIES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \         @$(foreach i, $(PEGASUS_SPECIFIC_DIRECTORIES), \
              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              $(ECHO-E) "ls -ld $(i)" >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
           @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
           @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_LIB_DIR)" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
Line 997 
Line 1008 
         @$(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-arch.spec \
                >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%global PEGASUS_ARCH_LIB %{_lib}" >> \
               $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \         @$(ECHO-E) "%global OPENSSL_HOME $(OPENSSL_HOME)" >> \
             $(PEGASUS_RPM_SPEC_FILE_PATH)             $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%global OPENSSL_BIN $(OPENSSL_BIN)" >> \         @$(ECHO-E) "%global OPENSSL_BIN $(OPENSSL_BIN)" >> \
Line 1049 
Line 1065 
         @$(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)
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-arch.spec \  
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)  
  
 _append_PackagesToSpecFile: FORCE _append_PackagesToSpecFile: FORCE
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-packages.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-packages.spec \
Line 1121 
Line 1134 
         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
             $(ECHO-E) "   ln -sf $(i)$(LIB_SUFFIX)\             $(ECHO-E) "   ln -sf $(i)$(LIB_SUFFIX)\
             $(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              $(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(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) "   # Create Symbolic Links for Packaged Provider Libraries"\         @$(ECHO-E) "   # Create Symbolic Links for Packaged Provider Libraries"\
Line 1129 
Line 1142 
         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "   #" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \         @$(foreach i, $(PEGASUS_PROVIDERS), $(ECHO-E) \
             "   ln -sf $(i)$(LIB_SUFFIX)\             "   ln -sf $(i)$(LIB_SUFFIX)\
             $(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              $(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(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 1183 
Line 1196 
              if [ $(i) != $(PEGASUS_CONFIG_DIR) ]; then \              if [ $(i) != $(PEGASUS_CONFIG_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;)
           @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_DIR_2) " \
                 >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%dir $(PEGASUS_PROVIDER_LIB_DIR_2) " \
                 >> $(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_x___), $(CIMSERVER_USR)," \
              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \              "$(CIMSERVER_GRP)) $(PEGASUS_CONFIG_DIR)" \
Line 1233 
Line 1250 
         @$(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)
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_DEST_LIB_DIR)/*$(LIB_SUFFIX)" \             "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(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_PROVIDER_LIB_DIR)/*$(LIB_SUFFIX)" \             "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)            "$(PEGASUS_SCRIPT_DIR)/*" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1249 
Line 1266 
             $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\             $(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))"\
             "$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             "$(PEGASUS_DOC_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
             $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(foreach i, $(PEGASUS_PROVIDERS), \         @$(foreach i, $(PEGASUS_PROVIDERS), \
             $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX)" \              $(ECHO-E) "$(PEGASUS_PROVIDER_LIB_DIR_2)/$(i)$(LIB_LINK_SUFFIX)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)             >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
  

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