new branch name

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index a865858..4dd947a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -564,7 +564,7 @@ clean-help:
 
 ### brute force clean
 distclean1:
-       rm -rf pldistro.mk .rpmmacros spec2make SPECS MAKE 
+       rm -rf pldistro.mk .rpmmacros spec2make header.spec SPECS MAKE 
 distclean2:
        rm -rf CODEBASES SOURCES BUILD RPMS SRPMS tmp
 distclean: distclean1 distclean2
@@ -659,7 +659,7 @@ packages:
        @$(foreach package,$(ALL), echo package=$(package) ref_module=$($(package).module) modules=$($(package)-MODULES); )
 
 modules:
-       @$(foreach module,$(ALL-MODULES), echo modules=$(module) svnpath=$($(module)-SVNPATH); )
+       @$(foreach module,$(ALL-MODULES), echo module=$(module) svnpath=$($(module)-SVNPATH); )
 
 branches:
        @$(foreach module,$(ALL-MODULES), \
@@ -667,8 +667,10 @@ branches:
 
 module-tools:
        @$(foreach module,$(ALL-MODULES), \
-         echo $(module); \
-         $(if $($(module)-SVNBRANCH),echo $(module):$($(module)-SVNBRANCH);))
+        $(if $($(module)-SVNPATH), \
+         $(if $($(module)-SVNBRANCH), \
+            echo $(module):$($(module)-SVNBRANCH); , \
+            echo $(module); )))
 
 info: packages modules branches 
 
@@ -739,6 +741,8 @@ help:
        @echo "  Displays know attributes of a package"
        @echo "make kernel-devel-rpminfo"
        @echo "  Displays know attributes of an rpm"
+       @echo "make stage1=true PLDISTROTAGS=planetlab-tags-4.2.mk packages modules branches module-tools"
+       @echo "  Lists mentioned items - module-tools is used in modules.update"
        @echo ""
        @echo "********** Known pakages are"
        @echo "$(ALL)"