From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org
Cc: Juergen Gross <jgross@suse.com>,
wei.liu2@citrix.com, ian.jackson@eu.citrix.com
Subject: [PATCH v2 04/17] tools: install PKG_INSTALLDIR in tools/Makefile
Date: Tue, 14 Mar 2017 14:31:11 +0100 [thread overview]
Message-ID: <20170314133124.942-5-jgross@suse.com> (raw)
In-Reply-To: <20170314133124.942-1-jgross@suse.com>
Instead of installing $(PKG_INSTALLDIR) in multiple Makefiles below
tools, do so in tools/Makefile.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
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@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-03-14 13:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-14 13:31 [PATCH v2 00/17] tools: provide pkg-config files for all libs Juergen Gross
2017-03-14 13:31 ` [PATCH v2 01/17] tools: fix typo in tools/Rules.mk Juergen Gross
2017-03-14 13:31 ` [PATCH v2 02/17] tools: add missing library flag definitions Juergen Gross
2017-03-14 13:31 ` [PATCH v2 03/17] tools, stubdom: set PKG_CONFIG_DIR in main Makefiles Juergen Gross
2017-03-14 13:31 ` Juergen Gross [this message]
2017-03-14 14:11 ` [PATCH v2 04/17] tools: install PKG_INSTALLDIR in tools/Makefile Wei Liu
2017-03-14 13:31 ` [PATCH v2 05/17] tools: add support for additional items in .pc files for local builds Juergen Gross
2017-03-14 13:31 ` [PATCH v2 06/17] tools: provide pkg-config file for libxentoollog Juergen Gross
2017-03-14 13:31 ` [PATCH v2 07/17] tools: provide pkg-config file for libxenevtchn Juergen Gross
2017-03-14 13:31 ` [PATCH v2 08/17] tools: provide pkg-config file for libxengnttab Juergen Gross
2017-03-14 20:06 ` Andrew Cooper
2017-03-15 6:07 ` Juergen Gross
2017-03-15 10:33 ` Andrew Cooper
2017-03-15 10:17 ` Wei Liu
2017-03-15 10:26 ` Juergen Gross
2017-03-15 10:29 ` Wei Liu
2017-03-15 10:32 ` Andrew Cooper
2017-03-14 13:31 ` [PATCH v2 09/17] tools: provide pkg-config file for libxencall Juergen Gross
2017-03-14 13:31 ` [PATCH v2 10/17] tools: provide pkg-config file for libxenforeignmemory Juergen Gross
2017-03-14 13:31 ` [PATCH v2 11/17] tools: provide pkg-config file for libxendevicemodel Juergen Gross
2017-03-14 13:31 ` [PATCH v2 12/17] tools: provide pkg-config file for libxenguest, update the one for libxenctrl Juergen Gross
2017-03-14 13:31 ` [PATCH v2 13/17] tools: provide pkg-config file for libxenstore Juergen Gross
2017-03-14 13:31 ` [PATCH v2 14/17] tools: provide pkg-config file for libxenstat Juergen Gross
2017-03-14 13:31 ` [PATCH v2 15/17] tools: provide pkg-config file for libxenvchan Juergen Gross
2017-03-14 13:31 ` [PATCH v2 16/17] tools: provide pkg-config file for libxenblktapctl Juergen Gross
2017-03-14 13:31 ` [PATCH v2 17/17] tools: adapt xenlight.pc and xlutil.pc to new pkg-config scheme Juergen Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170314133124.942-5-jgross@suse.com \
--to=jgross@suse.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).