gunnar: server/make-helper openpkg-patched.mk,1.6,1.7
cvs at kolab.org
cvs at kolab.org
Mon Jan 18 11:57:43 CET 2010
Author: gunnar
Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv25450/make-helper
Modified Files:
openpkg-patched.mk
Log Message:
Do not rebuild openpkg if already build.
Index: openpkg-patched.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- openpkg-patched.mk 17 Jan 2010 13:03:48 -0000 1.6
+++ openpkg-patched.mk 18 Jan 2010 10:57:41 -0000 1.7
@@ -37,10 +37,13 @@
cat $$PATCH >> package.patch; \
done
+RPM_SOURCES ?= $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+
# Target for building the source package
-$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(RPM_SOURCES)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
# Target for building the binary package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(RPM_SOURCES)
+ echo S: $(SOURCES)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)
More information about the commits
mailing list