Skip to content
Snippets Groups Projects
Commit 00016ce2 authored by Simon McVittie's avatar Simon McVittie
Browse files

Install development tools into $(bindir)

parent 676e31f8
Branches
Tags
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
......@@ -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 \
......
......@@ -3,7 +3,6 @@
set -e;
set -u;
libexec=$(dirname $0);
me=$(basename $0);
usage ()
......
......@@ -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
......
......@@ -9,7 +9,7 @@ htmldir : @htmldir@
includedir : @includedir@
infodir : @infodir@
libdir : @libdir@
libexecdir : @libexecdir@
bindir : @bindir@
localedir : @localedir@
localstatedir : @localstatedir@
mandir : @mandir@
......
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/*
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment