bugfix: remove old set of local tools and plugins before installing

This is mostly important for the plugins.

A new installation may want to install a different set of plugins.
Cleaning up before re-installing makes sure that plugins from old
installations are properly removed.

Signed-off-by: Gordon Hecker <gh@emlix.com>

diff --git a/Changelog b/Changelog
index 99bb9737d144de4232ea084eac1da54465da5bd9..42d5d6f7a68518c7b7b0c4ed29b219193fbfe2ab 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,8 @@
 NEXT:
  * BuildIds are now calculated in advance to detect errors immediately
    before starting the first build process
+ * remove old local installation before re-installing. Plugins were not
+   removed in e2-install-e2 before.
 
 e2factory-2.3.6
  * the release build process changed: Results are now stored on the

diff --git a/Makefile b/Makefile
index 21fa5d972c5e8a77beccc245ca88ffea2aa37f00..61a3c9bc013e49f430c24bf4e19f8dc474b36251 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,12 @@ local: e2commit buildconfig.lua
 
 install-local:
        scripts/e2-locate-project-root
+       @echo removing old installation...
+       rm -rf $(LOCALBINDIR)
+       rm -rf $(LOCALLIBDIR)
+       rm -rf $(LOCALMAKDIR)
+       @echo removing old plugins...
+       rm -rf $(LOCALPLUGINDIR)
        $(MAKE) -C generic install-local
        $(MAKE) -C local install-local
        $(MAKE) -C templates install-local