(file) Return to RPMMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/RPMMakefile between version 1.1.2.6 and 1.3

version 1.1.2.6, 2008/02/20 02:35:54 version 1.3, 2007/05/23 20:05:38
Line 44 
Line 44 
 PLATFORM:=$(shell /bin/rpm --eval %_target_cpu) PLATFORM:=$(shell /bin/rpm --eval %_target_cpu)
 BRANCH:=$(PEGASUS_BUILD_BRANCH) BRANCH:=$(PEGASUS_BUILD_BRANCH)
 RPM:=rpm RPM:=rpm
 ifndef PEGASUS_RPM_BUILD_DEBUG  
     RPMBUILD:=rpmbuild  
 else  
     RPMBUILD:=rpmbuild -vv  
 endif  
 RPMBUILD:=rpmbuild RPMBUILD:=rpmbuild
 RM:=rm RM:=rm
 MV:=mv MV:=mv
Line 231 
Line 226 
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile setupSDK         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile setupSDK
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile testSDK         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile testSDK
         $(MAKE) --directory=$(PEGASUS_SAMPLES_DIR) -f Makefile unsetupSDK  
         @$(HOME_DIR)/check_for_core         @$(HOME_DIR)/check_for_core
  
         # Install the test RPM after running SDK tests. This is because         # Install the test RPM after running SDK tests. This is because
Line 253 
Line 247 
         -$(RPM) -e $(filter tog-pegasus-test%,$(TOG_INSTALLED_RPMS))         -$(RPM) -e $(filter tog-pegasus-test%,$(TOG_INSTALLED_RPMS))
         -$(RPM) -e $(filter tog-pegasus-devel%,$(TOG_INSTALLED_RPMS))         -$(RPM) -e $(filter tog-pegasus-devel%,$(TOG_INSTALLED_RPMS))
         -$(RPM) -e $(filter tog-pegasus-2%,$(TOG_INSTALLED_RPMS))         -$(RPM) -e $(filter tog-pegasus-2%,$(TOG_INSTALLED_RPMS))
         -$(RM) -rf  tog-pegasus-$(PEGASUS_RPM_VERSION)          -$(RM) -Rf tog-pegasus-$(PEGASUS_RPM_VERSION).old
           -$(MV) tog-pegasus-$(PEGASUS_RPM_VERSION) tog-pegasus-$(PEGASUS_RPM_VERSION).old
  
 buildRPM: cleanRPM createSRCRPM createBINRPM buildRPM: cleanRPM createSRCRPM createBINRPM
  


Legend:
Removed from v.1.1.2.6  
changed lines
  Added in v.1.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2