new branch name

[build.git] / onelab-install.mk

diff --git a/onelab-install.mk b/onelab-install.mk
index cc73489..0d54a30 100644 (file)
--- a/onelab-install.mk
+++ b/onelab-install.mk
@@ -6,6 +6,11 @@
 # Installation rules
 # 
 
+install:
+       @echo WARNING: this target is deprecated
+       @echo you might siwh to use the noderepo rpm instead
+       @echo former behaviour is available throuhg make install-obsolete
+
 # make install :
 #      uses $(PLCSSH) as an ssh address for the destination host
 #      first copies everything on a separate rpm repo, prepares it, 
@@ -24,7 +29,7 @@ endif
 
 RPMSAREA       := /var/www/html/install-rpms/
 
-BUILD_BASE     := $(shell cat .base)
+BUILD_BASE     := $(shell cat .base 2> /dev/null || echo base-undefined)
 BASENEW                := build-$(BUILD_BASE)
 BASEBAK                := planetlab-bak
 BASE           := planetlab
@@ -35,11 +40,11 @@ RSYNC_COND_DRY_RUN  := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC                  := rsync $(RSYNC_COND_DRY_RUN) 
 
 INSTALL-TARGETS := install-rpms install-index install-adopt install-bootstrap
-install: $(INSTALL-TARGETS)
-.PHONY: install $(INSTALL-TARGETS)
+install-obsolete: $(INSTALL-TARGETS)
+.PHONY: install install-obsolete $(INSTALL-TARGETS)
 
 install-help:
-       @echo install: $(INSTALL-TARGETS)
+       @echo install-obsolete: $(INSTALL-TARGETS)
 
 # compute the exact set of rpms to install - we do not need bootstrapfs nor myplc here
 node_packages=$(sort $(IN_VSERVER) $(IN_BOOTSTRAPFS))