[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v2 04/17] 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@xxxxxxxx> --- tools/Makefile | 5 ++++- tools/libxc/Makefile | 1 - tools/libxl/Makefile | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 828ee34..b40bd73 100644 --- 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 b15736c..0653ca3 100644 --- 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 f00d9ef..cd7ce6b 100644 --- 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) -- 2.10.2 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx https://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |