monitor vserverreference branch 4.2

[build.git] / Makefile

diff --git a/Makefile b/Makefile
index 6ffb801..8f184a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 # Thierry Parmentelat - INRIA Sophia Antipolis 
 #
 ### $Id$
+### $URL$
 # 
 ####################
 # invocation:
@@ -146,7 +147,9 @@ include $(PLDISTROCONTENTS)
 
 #################### include <pldistro>-tags.mk
 # describes where to fetch components, and the related tags if using cvs
+ifeq "$(PLDISTROTAGS)" ""
 PLDISTROTAGS := $(PLDISTRO)-tags.mk
+endif
 include $(PLDISTROTAGS)
 
 # this used to be set in the -tags.mk files, but that turned out to require
@@ -372,16 +375,15 @@ $(foreach package,$(ALL),$(eval $(call target_mk,$(package))))
 
 # stores PLDISTRO in a file
 # this is done at stage1. later run wont get confused
+SAVED_VARS=PLDISTRO PLDISTROTAGS build-SVNPATH PERSONALITY MAILTO BASE WEBPATH TESTBUILDURL WEBROOT
 savedpldistro.mk:
-       echo "PLDISTRO:=$(PLDISTRO)" > $@
-       echo "PLDISTROTAGS:=$(PLDISTROTAGS)" >> $@
-       echo "build-SVNPATH:=$(build-SVNPATH)" >> $@
-       echo "PERSONALITY:=$(PERSONALITY)" >> $@
-       echo "MAILTO:=$(MAILTO)" >> $@
-       echo "BASE:=$(BASE)" >> $@
-       echo "WEBPATH:=$(WEBPATH)" >> $@
-       echo "TESTBUILDURL:=$(TESTBUILDURL)" >> $@
-       echo "WEBROOT:=$(WEBROOT)" >> $@
+       @echo "# do not edit" > $@
+       @$(foreach var,$(SAVED_VARS),echo "$(var):=$($(var))" >> $@ ;)
+       @echo "# do not edit" > aliases
+       @echo -n "alias m=\"make " >> aliases
+       @$(foreach var,$(SAVED_VARS),echo -n " $(var)=$($(var))" >> aliases ;)
+       @echo "\"" >> aliases
+       @echo "alias m1=\"m stage1=true\"" >> aliases
 
 savedpldistro: savedpldistro.mk
 .PHONY: savedpldistro
@@ -657,7 +659,7 @@ clean-help:
 distclean1:
        rm -rf savedpldistro.mk .rpmmacros spec2make header.spec SPECS MAKE $(DISTCLEANS)
 distclean2:
-       rm -rf CODEBASES SOURCES BUILD RPMS SRPMS tmp
+       rm -rf CODEBASES SOURCES BUILD BUILDROOT RPMS SRPMS tmp
 distclean: distclean1 distclean2
 .PHONY: distclean1 distclean2 distclean