(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.98

version 1.86.12.2, 2008/11/19 23:43:43 version 1.98, 2009/07/28 14:10:24
Line 1 
Line 1 
 #//%2006////////////////////////////////////////////////////////////////////////  #//%LICENSE////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  #// Licensed to The Open Group (TOG) under one or more contributor license
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  #// agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 #// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  #// this work for additional information regarding copyright ownership.
 #// IBM Corp.; EMC Corporation, The Open Group.  #// Each contributor licenses this file to you under the OpenPegasus Open
 #// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  #// Source License; you may not use this file except in compliance with the
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  #// License.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; VERITAS Software Corporation; The Open Group.  
 #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 #// EMC Corporation; Symantec Corporation; The Open Group.  
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy  #// Permission is hereby granted, free of charge, to any person obtaining a
 #// of this software and associated documentation files (the "Software"), to  #// copy of this software and associated documentation files (the "Software"),
 #// deal in the Software without restriction, including without limitation the  #// to deal in the Software without restriction, including without limitation
 #// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  #// the rights to use, copy, modify, merge, publish, distribute, sublicense,
 #// sell copies of the Software, and to permit persons to whom the Software is  #// and/or sell copies of the Software, and to permit persons to whom the
 #// furnished to do so, subject to the following conditions:  #// Software is furnished to do so, subject to the following conditions:
 #// #//
 #// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  #// The above copyright notice and this permission notice shall be included
 #// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  #// in all copies or substantial portions of the Software.
 #// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 #// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 #// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 #// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 #// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 #// #//
 #//==============================================================================  #// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   #// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   #// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   #// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   #// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   #// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   #// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   #//
   #//////////////////////////////////////////////////////////////////////////
 ifndef ROOT ifndef ROOT
  ifdef PEGASUS_ROOT  ifdef PEGASUS_ROOT
     ROOT =  $(subst \,/,$(PEGASUS_ROOT))     ROOT =  $(subst \,/,$(PEGASUS_ROOT))
Line 90 
Line 88 
    libpegauthentication \    libpegauthentication \
    libpegclient \    libpegclient \
    libpegcliutils \    libpegcliutils \
      libpeggeneral \
    libpegcommon \    libpegcommon \
    libpegcompiler \    libpegcompiler \
    libpegconfig \    libpegconfig \
Line 119 
Line 118 
       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 += \
    libCMPIProviderManager    libCMPIProviderManager
 endif endif
  
   PEGASUS_JARS =
   JAR_SUFFIX = .jar
   
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
   PEGASUS_LIBRARIES += \
      libJMPIProviderManager
   PEGASUS_JARS += \
      JMPIImpl
   endif
  
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
Line 144 
Line 152 
    libDefaultProviderManager \    libDefaultProviderManager \
    libCIMxmlIndicationHandler    libCIMxmlIndicationHandler
  
   ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
      PEGASUS_LIBRARY_LINKS += \
          libJMPIProviderManager
   endif
   
 ifdef PEGASUS_USE_NET_SNMP ifdef PEGASUS_USE_NET_SNMP
 PEGASUS_LIBRARY_LINKS += \ PEGASUS_LIBRARY_LINKS += \
    libsnmpIndicationHandler    libsnmpIndicationHandler
Line 172 
Line 185 
    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 199 
Line 212 
    $(PEGASUS_GENERATED_SCRIPTS) \    $(PEGASUS_GENERATED_SCRIPTS) \
    $(PEGASUS_CVS_SCRIPTS)    $(PEGASUS_CVS_SCRIPTS)
  
 PEGASUS_REPOSITORY_DIRS = \  
    root\  
    root\#PG_Internal \  
    root\#PG_InterOp \  
    root\#cimv2  
   
 PEGASUS_UNIX_MAN_USER_PAGES = \ PEGASUS_UNIX_MAN_USER_PAGES = \
    cimmof.1 \    cimmof.1 \
    cimprovider.1 \    cimprovider.1 \
Line 291 
Line 298 
 setpermissions_PegasusLocalAuthDirectory: FORCE setpermissions_PegasusLocalAuthDirectory: FORCE
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_AUTH_DIR)
  
   stage_PegasusJarFiles: FORCE
           $(foreach i, $(PEGASUS_JARS), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(JAR_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(JAR_SUFFIX);)
   
   setpermissions_PegasusJarFiles: FORCE
           $(foreach i, $(PEGASUS_JARS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(JAR_SUFFIX);)
   
   
 stage_PegasusLibraryDirectoryFiles: FORCE stage_PegasusLibraryDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)         $(foreach i, $(PEGASUS_LIBRARIES), $(COPY) $(PEGASUS_HOME)/lib/$(i)$(LIB_SUFFIX) $(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_SUFFIX);)
         $(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)         $(foreach i, $(PEGASUS_LIBRARY_LINKS), $(MAKE) --directory=$(ROOT) -f Makefile.Release createlink OBJECT=$(i)$(LIB_SUFFIX) LINKNAME=$(PEGASUS_STAGING_DIR)$(PEGASUS_DEST_LIB_DIR)/$(i)$(LIB_LINK_SUFFIX);)
Line 327 
Line 341 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)
         $(foreach i, $(PEGASUS_USER_CMDS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)/$(i)$(EXE);)         $(foreach i, $(PEGASUS_USER_CMDS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)/$(i)$(EXE);)
  
 stage_RepositoryNamespaceDirectory: FORCE  stage_PegasusRepository: FORCE
         $(CPDIRHIER) $(NAMESPACE_DIR_NAME) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)  
   
 setpermissions_RepositoryNamespaceDirectory: FORCE  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/classes  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/instances  
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)/$(NAMESPACE_DIR_NAME)/qualifiers  
         $(MAKE) --directory=$(ROOT) -f 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  
         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)         $(RMDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
         $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)          $(CPDIRHIER) $(PEGASUS_HOME)/repository $(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_PARENT_DIR)
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(PEGASUS_HOME)/repository -f $(ROOT)/Makefile.Release stage_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)  
  
 setpermissions_PegasusRepositoryDirectories: FORCE  setpermissions_PegasusRepository: FORCE
         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)         $(MAKE) --directory=$(ROOT) -f Makefile.Release sethierpermissions PERMISSIONS="$(Prwx______)" OWNER="$(CIMSERVERMAIN_USR)" GROUP="$(CIMSERVERMAIN_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_REPOSITORY_DIR)
         $(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_RepositoryNamespaceDirectory NAMESPACE_DIR_NAME=$(i);)  
  
 stage_PegasusUnixManPageDirectoryFiles: FORCE stage_PegasusUnixManPageDirectoryFiles: FORCE
         $(foreach i, $(PEGASUS_UNIX_MAN_USER_PAGES), $(COPY) $(ROOT)/rpm/manLinux/man1.Z/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MANUSER_DIR)/$(i);)         $(foreach i, $(PEGASUS_UNIX_MAN_USER_PAGES), $(COPY) $(ROOT)/rpm/manLinux/man1.Z/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_MANUSER_DIR)/$(i);)
Line 358 
Line 358 
  
 stage_PegasusDocFiles: FORCE stage_PegasusDocFiles: FORCE
         $(foreach i, $(PEGASUS_DOC_FILES), $(COPY) $(ROOT)/doc/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)         $(foreach i, $(PEGASUS_DOC_FILES), $(COPY) $(ROOT)/doc/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)
           $(COPY) $(ROOT)/OpenPegasusNOTICE.txt \
               $(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/OpenPegasusNOTICE.txt
  
 setpermissions_PegasusDocFiles: FORCE setpermissions_PegasusDocFiles: FORCE
         $(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)         $(foreach i, $(PEGASUS_DOC_FILES), $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_DOC_DIR)/$(i);)
Line 418 
Line 420 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusAdminCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusAdminCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUserCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUserCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusVarDataDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusVarDataDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusRepositoryDirectories          $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusRepository
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUnixManPageDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusUnixManPageDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusDocFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusMOFDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusMOFDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusSystemFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusSystemFiles
           $(MAKE) --directory=$(ROOT) -f Makefile.Release stage_PegasusJarFiles
  
 setpermissions_PegasusFiles: FORCE setpermissions_PegasusFiles: FORCE
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusLibraryDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusLibraryDirectoryFiles
Line 431 
Line 434 
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusAdminCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusAdminCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUserCmdsDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUserCmdsDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusVarDataDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusVarDataDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusRepositoryDirectories          $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusRepository
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUnixManPageDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusUnixManPageDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusDocFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusMOFDirectoryFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusMOFDirectoryFiles
         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusSystemFiles         $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusSystemFiles
           $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions_PegasusJarFiles
  
 stage_PegasusSystemFiles: FORCE stage_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux) ifeq ($(OS),linux)
Line 607 
Line 611 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_PROVIDER_MANAGER_LIB_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "ls -ld $(PEGASUS_REPOSITORY_DIR)" \  
              >> $(PEGASUS_HOME)/PegasusVerifyInstall  
         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \         @$(ECHO-E) "ls -ld $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS DOCUMENT FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS DOCUMENT FILES\"" \
Line 616 
Line 618 
         @$(foreach i, $(PEGASUS_DOC_FILES), \         @$(foreach i, $(PEGASUS_DOC_FILES), \
              $(ECHO-E) "ls -l $(PEGASUS_DOC_DIR)/$(i)" \              $(ECHO-E) "ls -l $(PEGASUS_DOC_DIR)/$(i)" \
                  >> $(PEGASUS_HOME)/PegasusVerifyInstall;)                  >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
           @$(ECHO-E) "ls -l $(PEGASUS_DOC_DIR)/OpenPegasusNOTICE.txt" \
                >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS LIBRARIES FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS LIBRARIES FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_LIBRARIES), $(ECHO-E) \         @$(foreach i, $(PEGASUS_LIBRARIES), $(ECHO-E) \
Line 657 
Line 661 
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS REPOSITORY FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS REPOSITORY FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_REPOSITORY_DIRS), $(ECHO-E) \          @$(ECHO-E) "ls -lR $(PEGASUS_REPOSITORY_DIR)" \
              "ls -ld $(PEGASUS_REPOSITORY_DIR)/$(i)" \               >> $(PEGASUS_HOME)/PegasusVerifyInstall
              >> $(PEGASUS_HOME)/PegasusVerifyInstall;)  
         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS MAN FILES\"" \         @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS MAN FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall              >> $(PEGASUS_HOME)/PegasusVerifyInstall
         @$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), $(ECHO-E) \         @$(foreach i, $(PEGASUS_UNIX_MAN_ADMIN_PAGES), $(ECHO-E) \
Line 875 
Line 878 
         @$(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 929 
              >> $(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 1009 
         @$(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" \
Line 1100 
Line 1103 
         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \         @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
            "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \            "$(PEGASUS_DEST_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%if %{JMPI_PROVIDER_REQUESTED}"  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%attr($(Prwxr_xr_x),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_DEST_LIB_DIR_2)/*$(JAR_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/libJMPIProviderManager$(LIB_LINK_SUFFIX)" \
              >> $(PEGASUS_RPM_SPEC_FILE_PATH)
           @$(ECHO-E) "%endif"  >> $(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_2)/*$(LIB_SUFFIX)" \            "$(PEGASUS_PROVIDER_LIB_DIR_2)/*$(LIB_SUFFIX)" \
            >> $(PEGASUS_RPM_SPEC_FILE_PATH)            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
Line 1116 
Line 1126 
         @$(foreach i, $(PEGASUS_DOC_FILES), \         @$(foreach i, $(PEGASUS_DOC_FILES), \
             $(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);)
           @$(ECHO-E) "%doc %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP))" \
              "$(PEGASUS_DOC_DIR)/OpenPegasusNOTICE.txt" \
               >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \         @$(foreach i, $(PEGASUS_LIBRARY_LINKS), \
             $(ECHO-E) "$(PEGASUS_DEST_LIB_DIR_2)/$(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);)


Legend:
Removed from v.1.86.12.2  
changed lines
  Added in v.1.98

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2