diff options
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 07edf09aa..6ca596c7e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,17 +43,15 @@ else gpg_wks_server = endif -libexec_PROGRAMS = gpg-wks-client -bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card +bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card gpg-wks-client if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit else bin_PROGRAMS += gpgconf-w32 endif -libexec_PROGRAMS += gpg-check-pattern -libexec_PROGRAMS += gpg-pair-tool +libexec_PROGRAMS = gpg-check-pattern gpg-pair-tool if !HAVE_W32CE_SYSTEM noinst_PROGRAMS = clean-sat make-dns-cert @@ -191,6 +189,22 @@ gpg_pair_tool_LDADD = $(libcommon) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) +# Instead of a symlink we install a simple wrapper script for the new +# gpg-wks-client location. We assume bin is a sibling of libexec. +install-exec-local: + $(mkinstalldirs) $(DESTDIR)$(libexecdir) + (set -e ;\ + if [ "$(libexecdir)" != "$(bindir)" ]; then \ + printf '#!/bin/sh\nexec "$(bindir)/gpg-wks-client" "$$@"\n' \ + > $(DESTDIR)$(libexecdir)/gpg-wks-client ;\ + chmod +x $(DESTDIR)$(libexecdir)/gpg-wks-client ;\ + fi ) + +uninstall-local: + (if [ "$(libexecdir)" != "$(bindir)" ]; then \ + rm $(DESTDIR)$(libexecdir)/gpg-wks-client || true ;\ + fi ) + # Make sure that all libs are build before we use them. This is # important for things like make -j2. $(PROGRAMS): $(common_libs) $(pwquery_libs) ../common/libgpgrl.a |