X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=2441af5f8e7193cb922645eb14b74e44daf0144e;hb=5919d0191a10c9ccabd905b52092e70dd2fa79fd;hp=0e20f012c0ffd1534e0c56d8333d06d723b48beb;hpb=638b44d5ee47e303e6bf103940b5d2b6f79ebcef;p=build.git

diff --git a/Makefile b/Makefile
index 0e20f012..2441af5f 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@
 # (*) package-DEPENDDEVELS
 #     a set of *packages* that the build will rpm-install the -devel variant before building <package>
 # (*) package-DEPENDDEVELRPMS
-#     a set of *rpm* that the build will rpm-install before building <package>
+#     a set of *rpms* that the build will rpm-install before building <package>
 # (*) package-DEPENDFILES
 #     a set of files that the package depends on - and that make needs to know about
 #     if this contains RPMS/yumgroups.xml, then the toplevel RPMS's index 
@@ -193,14 +193,14 @@ include $(ALLMKS)
 # this is because the inter-package dependencies are expressed like
 # util-vserver: util-python
 all: rpms
+all: repo
 endif
 endif
 
 ####################
 # gather build information for the 'About' page
-SOURCES/myplc-release:
+myplc-release:
 	@echo 'Creating myplc-release'
-	mkdir -p SOURCES
 	rm -f $@
 	(echo -n 'Build bdate: ' ; date '+%Y.%m.%d') >> $@
 	(echo -n 'Build btime: ' ; date '+%H:%M') >> $@
@@ -210,6 +210,23 @@ SOURCES/myplc-release:
 	echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx modules versions info" >> $@
 	$(MAKE) --no-print-directory versions >> $@
 
+### yumgroups.xml
+# the source
+ifndef YUMGROUPS
+YUMGROUPS := groups/$(PLDISTRO).xml
+endif
+
+RPMS/yumgroups.xml: $(YUMGROUPS)
+	mkdir -p RPMS
+	install -D -m 644 $(YUMGROUPS) $@
+
+createrepo = createrepo --quiet -g yumgroups.xml RPMS/ 
+
+repo: RPMS/yumgroups.xml
+	$(createrepo)
+
+.PHONY: repo
+
 ####################
 # notes: 
 # * to make configuration easier, we always use the first module's
@@ -285,6 +302,7 @@ export HOME := /building
 	echo "%_tmppath $(HOME)/tmp" >> $@
 	echo "%_netsharedpath /proc:/dev/pts" >> $@
 	echo "%_install_langs C:de:en:es:fr" >> $@
+	echo "%_excludedocs yes" >> $@
 
 ### run spec2make on the spec file and include the result
 # usage: spec2make package
@@ -427,7 +445,7 @@ define target_binary_rpm
 $($(1)-RPMS): $($(1)-SRPM)
 	mkdir -p BUILD RPMS SPECS tmp
 	@(echo -n "XXXXXXXXXXXXXXX -- BEG RPM $(1) " ; date)
-	$(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPENDFILES)), createrepo --quiet -g yumgroups.xml RPMS/ , )
+	$(if $(findstring RPMS/yumgroups.xml,$($(1)-DEPENDFILES)), $(createrepo) , )
 	$(if $($(1)-RPMBUILD),\
 	  $($(1)-RPMBUILD) $($(1)-RPMFLAGS) --rebuild --define "_sourcedir $(HOME)/tmp" $($(1)-SRPM), \
 	  $(RPMBUILD)  $($(1)-RPMFLAGS) --rebuild --define "_sourcedir $(HOME)/tmp" $($(1)-SRPM))
@@ -436,13 +454,6 @@ endef
 
 $(foreach package,$(ALL),$(eval $(call target_binary_rpm,$(package))))
 
-### RPMS/yumgroups.xml
-ifndef YUMGROUPS
-YUMGROUPS := groups/$(PLDISTRO).xml
-endif
-RPMS/yumgroups.xml: $(YUMGROUPS)
-	install -D -m 644 $(YUMGROUPS) $@
-
 ### shorthand target
 # e.g. make proper -> does propers rpms
 # usage shorthand_target package