2002-03-29 Marcus Brinkmann <marcus@g10code.de>

	* kde/Makefile.am (pinentry_kde_LDADD): Link with $(LIBCAP).
	* gtk/Makefile.am (install-exec-local): Moved to ...
	* Makefile.am (install-exec-local): ... here.

diff --git a/ChangeLog b/ChangeLog
index a6e1e1e..b5642f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-03-29  Marcus Brinkmann  <marcus@g10code.de>
 
+       * kde/Makefile.am (pinentry_kde_LDADD): Link with $(LIBCAP).
+       * gtk/Makefile.am (install-exec-local): Moved to ...
+       * Makefile.am (install-exec-local): ... here.
+
+2002-03-29  Marcus Brinkmann  <marcus@g10code.de>
+
        * kde/Makefile.am (kde_appsdir): New variable.
        * kde/Makefile.am (install-data-local): Use DESTDIR.
        (uninstall-local): Likewise.

diff --git a/Makefile.am b/Makefile.am
index 6173825..e8dff9d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,3 +46,9 @@ signed-dist: $(distdir).tar.gz.sig
 
 %.sig: %
        gpg -sbav -u 0x57548DCD $@ $<
+
+install-exec-local:
+       @list='$(bin_PROGRAMS)'; for p in $$list; do \
+         echo "  $(SETCAP) cap_ipc_lock+p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+         $(SETCAP) cap_ipc_lock+p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'` || true; \
+       done

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index fdce399..61a682e 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -29,9 +29,3 @@ LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
 
 pinentry_gtk_SOURCES = pinentry-gtk.c \
        gtksecentry.c gtksecentry.h
-
-install-exec-local:
-       @list='$(bin_PROGRAMS)'; for p in $$list; do \
-         echo "  $(SETCAP) cap_ipc_lock+p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-         $(SETCAP) cap_ipc_lock+p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'` || true; \
-       done

diff --git a/kde/Makefile.am b/kde/Makefile.am
index 4396e42..028b6a4 100644 (file)
--- a/kde/Makefile.am
+++ b/kde/Makefile.am
@@ -42,7 +42,7 @@ bin_PROGRAMS = pinentry-kde
 # Set the include path for X, qt, KDE and the included libs.
 AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(XXX_KDE_DEFINES)
 pinentry_kde_LDADD = $(top_builddir)/assuan/libassuan.a \
-       $(top_builddir)/secmem/libsecmem.a \
+       $(top_builddir)/secmem/libsecmem.a $(LIBCAP) \
        $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
 pinentry_kde_LDFLAGS = $(KDE_RPATH)