make sure createrepo gets called after all is done

diff --git a/Makefile b/Makefile
index 9a24efa..2441af5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -193,6 +193,7 @@ include $(ALLMKS)
 # this is because the inter-package dependencies are expressed like
 # util-vserver: util-python
 all: rpms
 # this is because the inter-package dependencies are expressed like
 # util-vserver: util-python
 all: rpms

+all: repo

 endif
 endif
 
 endif
 endif
 


@@ -209,6 +210,23 @@ myplc-release:
        echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx modules versions info" >> $@
        $(MAKE) --no-print-directory versions >> $@
 
        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
 ####################
 # notes: 
 # * to make configuration easier, we always use the first module's


@@ -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)
 $($(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))
        $(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))))
 
 
 $(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
 ### shorthand target
 # e.g. make proper -> does propers rpms
 # usage shorthand_target package