[GNUnet-SVN] r36389 - in gnunet/src: dns exit gns/nss nat transport vpn

[gnunet]

Author: lynx
Date: 2015-09-30 22:15:37 +0200 (Wed, 30 Sep 2015)
New Revision: 36389

Modified:
   gnunet/src/dns/Makefile.am
   gnunet/src/exit/Makefile.am
   gnunet/src/gns/nss/Makefile.am
   gnunet/src/nat/Makefile.am
   gnunet/src/transport/Makefile.am
   gnunet/src/vpn/Makefile.am
Log:
DESTDIR fix in Makefiles needed by distro packagers

Modified: gnunet/src/dns/Makefile.am
===================================================================
--- gnunet/src/dns/Makefile.am  2015-09-30 20:13:41 UTC (rev 36388)
+++ gnunet/src/dns/Makefile.am  2015-09-30 20:15:37 UTC (rev 36389)
@@ -21,7 +21,7 @@
 if LINUX
 HIJACKBIN = gnunet-helper-dns
 install-exec-hook:
-       $(top_srcdir)/src/dns/install-dns-helper.sh $(libexecdir) 
$(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
+       $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) 
$(GNUNETDNS_GROUP) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif

Modified: gnunet/src/exit/Makefile.am
===================================================================
--- gnunet/src/exit/Makefile.am 2015-09-30 20:13:41 UTC (rev 36388)
+++ gnunet/src/exit/Makefile.am 2015-09-30 20:15:37 UTC (rev 36389)
@@ -22,7 +22,7 @@
 if LINUX
 EXITBIN = gnunet-helper-exit
 install-exec-hook:
-       $(top_srcdir)/src/exit/install-exit-helper.sh $(libexecdir) 
$(SUDO_BINARY) || true
+       $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) 
$(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif

Modified: gnunet/src/gns/nss/Makefile.am
===================================================================
--- gnunet/src/gns/nss/Makefile.am      2015-09-30 20:13:41 UTC (rev 36388)
+++ gnunet/src/gns/nss/Makefile.am      2015-09-30 20:15:37 UTC (rev 36389)
@@ -60,7 +60,7 @@
 if INSTALL_NSS
 if !MINGW
 install-data-hook:
-       $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) 
$(top_builddir) $(nssdir) $(SUDO_BINARY)
+       $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) 
$(top_builddir) $(DESTDIR)$(nssdir) $(SUDO_BINARY)
 
 uninstall-hook:
        $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) 
$(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY)

Modified: gnunet/src/nat/Makefile.am
===================================================================
--- gnunet/src/nat/Makefile.am  2015-09-30 20:13:41 UTC (rev 36388)
+++ gnunet/src/nat/Makefile.am  2015-09-30 20:15:37 UTC (rev 36389)
@@ -20,7 +20,7 @@
   NATSERVER = gnunet-helper-nat-server.c
   NATCLIENT = gnunet-helper-nat-client.c
 install-exec-hook:
-       $(top_srcdir)/src/nat/install-nat-helper.sh $(libexecdir) 
$(SUDO_BINARY) || true
+       $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) 
$(SUDO_BINARY) || true
 else
 if XFREEBSD
   NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
@@ -27,7 +27,7 @@
   NATSERVER = gnunet-helper-nat-server.c
   NATCLIENT = gnunet-helper-nat-client.c
 install-exec-hook:
-       $(top_srcdir)/src/nat/install-nat-helper.sh $(libexecdir) 
$(SUDO_BINARY) || true
+       $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) 
$(SUDO_BINARY) || true
 endif
 else
 install-exec-hook:

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2015-09-30 20:13:41 UTC (rev 36388)
+++ gnunet/src/transport/Makefile.am    2015-09-30 20:15:37 UTC (rev 36389)
@@ -95,9 +95,9 @@
 
 if LINUX
 install-exec-hook:
-       $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) 
$(SUDO_BINARY) || true
+       $(top_srcdir)/src/transport/install-wlan-helper.sh 
$(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 if HAVE_LIBBLUETOOTH
-       $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) 
$(SUDO_BINARY) || true
+       $(top_srcdir)/src/transport/install-bluetooth-helper.sh 
$(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true
 endif
 else
 install-exec-hook:

Modified: gnunet/src/vpn/Makefile.am
===================================================================
--- gnunet/src/vpn/Makefile.am  2015-09-30 20:13:41 UTC (rev 36388)
+++ gnunet/src/vpn/Makefile.am  2015-09-30 20:15:37 UTC (rev 36389)
@@ -22,7 +22,7 @@
 if LINUX
 VPNBIN = gnunet-helper-vpn
 install-exec-hook:
-       $(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) 
$(SUDO_BINARY) || true
+       $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) 
$(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif