From 00016ce272970a8e57b173570ab810682fdc64eb Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 13 Nov 2017 13:42:37 +0000
Subject: [PATCH] Install development tools into $(bindir)

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 Makefile.am                       | 14 +++++++-------
 data/capsule-init-project         |  1 -
 data/capsule.pc.in                |  6 +++---
 data/dirconf.txt.in               |  2 +-
 debian/libcapsule-dev-bin.install |  6 +++---
 debian/rules                      |  4 ++--
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8107c736e..2b17ed71f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ AM_LDFLAGS              = $(WARN_LDFLAGS)
 static_docs             = Building Debugging Limitations Quick-Start Capsules
 
 # installable items:
-libexec_PROGRAMS        = capsule-symbols capsule-version
+bin_PROGRAMS            = capsule-symbols capsule-version
 dist_bin_SCRIPTS        = data/capsule-init-project
 lib_LTLIBRARIES         = libcapsule.la
 pkgconfigdir            = $(libdir)/pkgconfig
@@ -33,7 +33,7 @@ pkgconfig_DATA          = data/capsule.pc
 nobase_include_HEADERS  = capsule/capsule.h
 dist_doc_DATA           = $(foreach doc,$(static_docs),doc/$(doc).txt)
 
-libexec_SCRIPTS         = data/$(host)-capsule-mkstublib
+bin_SCRIPTS             = data/$(host)-capsule-mkstublib
 
 # Write out a version of capsule-mkstublib with different defaults
 # for each architecture
@@ -42,17 +42,17 @@ data/$(host)-capsule-mkstublib: data/capsule-mkstublib Makefile
 	( \
 		sed -e 1q $<; \
 		echo '# Inserted by Makefile to make this architecture-specific'; \
-		echo ': "$${CAPSULE_SYMBOLS_TOOL:="$(libexecdir)/$(host)-capsule-symbols"}"';\
+		echo ': "$${CAPSULE_SYMBOLS_TOOL:="$(bindir)/$(host)-capsule-symbols"}"';\
 		sed -e 1d $<; \
 	) > $@.tmp; chmod +x $@.tmp; mv $@.tmp $@
 
 install-exec-hook:
-	cd $(DESTDIR)$(libexecdir) && ln -f capsule-symbols $(host)-capsule-symbols
-	cd $(DESTDIR)$(libexecdir) && ln -f capsule-version $(host)-capsule-version
+	cd $(DESTDIR)$(bindir) && ln -f capsule-symbols $(host)-capsule-symbols
+	cd $(DESTDIR)$(bindir) && ln -f capsule-version $(host)-capsule-version
 
 uninstall-hook:
-	cd $(DESTDIR)$(libexecdir) && rm -f $(host)-capsule-symbols
-	cd $(DESTDIR)$(libexecdir) && rm -f $(host)-capsule-version
+	cd $(DESTDIR)$(bindir) && rm -f $(host)-capsule-symbols
+	cd $(DESTDIR)$(bindir) && rm -f $(host)-capsule-version
 
 # Headers to be included by shim libraries
 nobase_include_HEADERS += capsule/capsule-shim.h \
diff --git a/data/capsule-init-project b/data/capsule-init-project
index 567e25661..54a874fea 100755
--- a/data/capsule-init-project
+++ b/data/capsule-init-project
@@ -3,7 +3,6 @@
 set -e;
 set -u;
 
-libexec=$(dirname $0);
 me=$(basename $0);
 
 usage ()
diff --git a/data/capsule.pc.in b/data/capsule.pc.in
index 6e597791e..308037978 100644
--- a/data/capsule.pc.in
+++ b/data/capsule.pc.in
@@ -7,9 +7,9 @@ datarootdir=@datarootdir@
 datadir=@datarootdir@
 makeinc=@datadir@/libcapsule
 CAPSULE_INIT_PROJECT_TOOL=@bindir@/capsule-init-project
-CAPSULE_MKSTUBLIB_TOOL=@libexecdir@/@host@-capsule-mkstublib
-CAPSULE_SYMBOLS_TOOL=@libexecdir@/@host@-capsule-symbols
-CAPSULE_VERSION_TOOL=@libexecdir@/@host@-capsule-version
+CAPSULE_MKSTUBLIB_TOOL=@bindir@/@host@-capsule-mkstublib
+CAPSULE_SYMBOLS_TOOL=@bindir@/@host@-capsule-symbols
+CAPSULE_VERSION_TOOL=@bindir@/@host@-capsule-version
 
 Name: capsule
 Description: segregated dynamic linking library
diff --git a/data/dirconf.txt.in b/data/dirconf.txt.in
index 98686750d..b1bcd397c 100644
--- a/data/dirconf.txt.in
+++ b/data/dirconf.txt.in
@@ -9,7 +9,7 @@ htmldir       : @htmldir@
 includedir    : @includedir@
 infodir       : @infodir@
 libdir        : @libdir@
-libexecdir    : @libexecdir@
+bindir        : @bindir@
 localedir     : @localedir@
 localstatedir : @localstatedir@
 mandir        : @mandir@
diff --git a/debian/libcapsule-dev-bin.install b/debian/libcapsule-dev-bin.install
index f68e0c701..33aace890 100644
--- a/debian/libcapsule-dev-bin.install
+++ b/debian/libcapsule-dev-bin.install
@@ -1,6 +1,6 @@
+usr/bin/*-capsule-mkstublib
+usr/bin/*-capsule-symbols
+usr/bin/*-capsule-version
 usr/bin/capsule-init-project
-usr/lib/libcapsule/*-capsule-mkstublib
-usr/lib/libcapsule/*-capsule-symbols
-usr/lib/libcapsule/*-capsule-version
 usr/share/libcapsule/*
 usr/share/man/man1/*
diff --git a/debian/rules b/debian/rules
index 5dd1d6515..b2708705b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,8 +57,8 @@ override_dh_install:
 	find debian/tmp/usr/lib/libcapsule/installed-tests -name '*.la' -print -delete
 	# Only keep the architecture-qualified version, delete the unprefixed
 	# version, so we can be Multi-Arch: same
-	rm -f debian/tmp/usr/lib/libcapsule/capsule-symbols
-	rm -f debian/tmp/usr/lib/libcapsule/capsule-version
+	rm -f debian/tmp/usr/bin/capsule-symbols
+	rm -f debian/tmp/usr/bin/capsule-version
 	dh_install --fail-missing
 
 override_dh_autoreconf:
-- 
GitLab