tools: install PKG_INSTALLDIR in tools/Makefile

Instead of installing $(PKG_INSTALLDIR) in multiple Makefiles below
tools, do so in tools/Makefile.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/Makefile b/tools/Makefile
index 828ee34b848a7bb6d664567d844c76736911bfc4..b40bd730b9f906f0e1ccf06aa4815398b55fcece 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -64,12 +64,14 @@ endif
 build all: subdirs-all
 
 .PHONY: install
-install: subdirs-install
+install:
        $(INSTALL_DIR) -m 700 $(DESTDIR)$(XEN_DUMP_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR)
        $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_STORED)
+       $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR)
+       $(MAKE) subdirs-install
 
 .PHONY: uninstall
 uninstall: D=$(DESTDIR)
@@ -85,6 +87,7 @@ uninstall:
        rm -rf $(D)$(XEN_LIB_DIR)
        rm -rf $(D)$(XEN_LIB_STORED)
        rm -rf $(D)$(XEN_RUN_STORED)
+       rm -rf $(D)$(PKG_INSTALLDIR)
        rm -rf $(D)$(bindir)/cpuperf-perfcntr $(D)$(bindir)/cpuperf-xen
        rm -rf $(D)$(bindir)/xc_shadow
        rm -rf $(D)$(bindir)/pygrub

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index b15736cf8590130b1b09366a29bfd8186f6b4606..0653ca34f26a8c749ad9479ff907ba2174e17fad 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -189,7 +189,6 @@ libs: $(LIB) $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL)
 install: build
        $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
-       $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR)
        $(INSTALL_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
        $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir)
        $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR)

diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index f00d9ef3555e6b1cd79ba3f0939e818ced24d999..cd7ce6b98a48e0ccadb4ab1d457372b9350c53b7 100644 (file)
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -299,7 +299,6 @@ install: all
        $(INSTALL_DIR) $(DESTDIR)$(libdir)
        $(INSTALL_DIR) $(DESTDIR)$(includedir)
        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
-       $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR)
        $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN)
        $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
        $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenlight.so.$(MAJOR)