diff options
author | Carlo von lynX <lynX@time.to.get.psyced.org> | 2015-09-30 20:15:37 +0000 |
---|---|---|
committer | Carlo von lynX <lynX@time.to.get.psyced.org> | 2015-09-30 20:15:37 +0000 |
commit | e2f70a2f9fa099e3ce0e7451028bea8c373522a6 (patch) | |
tree | c4243c8c8e8cc8e01fb87aba489bab6ea715e8c5 /src | |
parent | ed4ed16a253da94fc7d647f299a12bccd62fa3ec (diff) | |
download | gnunet-e2f70a2f9fa099e3ce0e7451028bea8c373522a6.tar.gz gnunet-e2f70a2f9fa099e3ce0e7451028bea8c373522a6.zip |
DESTDIR fix in Makefiles needed by distro packagers
Diffstat (limited to 'src')
-rw-r--r-- | src/dns/Makefile.am | 2 | ||||
-rw-r--r-- | src/exit/Makefile.am | 2 | ||||
-rw-r--r-- | src/gns/nss/Makefile.am | 2 | ||||
-rw-r--r-- | src/nat/Makefile.am | 4 | ||||
-rw-r--r-- | src/transport/Makefile.am | 4 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index a8ff4265d..45b86c71b 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -21,7 +21,7 @@ pkgcfg_DATA = \ | |||
21 | if LINUX | 21 | if LINUX |
22 | HIJACKBIN = gnunet-helper-dns | 22 | HIJACKBIN = gnunet-helper-dns |
23 | install-exec-hook: | 23 | install-exec-hook: |
24 | $(top_srcdir)/src/dns/install-dns-helper.sh $(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true | 24 | $(top_srcdir)/src/dns/install-dns-helper.sh $(DESTDIR)$(libexecdir) $(GNUNETDNS_GROUP) $(SUDO_BINARY) || true |
25 | else | 25 | else |
26 | install-exec-hook: | 26 | install-exec-hook: |
27 | endif | 27 | endif |
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am index 10a1ae8f9..6c4cbf114 100644 --- a/src/exit/Makefile.am +++ b/src/exit/Makefile.am | |||
@@ -22,7 +22,7 @@ dist_pkgcfg_DATA = \ | |||
22 | if LINUX | 22 | if LINUX |
23 | EXITBIN = gnunet-helper-exit | 23 | EXITBIN = gnunet-helper-exit |
24 | install-exec-hook: | 24 | install-exec-hook: |
25 | $(top_srcdir)/src/exit/install-exit-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 25 | $(top_srcdir)/src/exit/install-exit-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true |
26 | else | 26 | else |
27 | install-exec-hook: | 27 | install-exec-hook: |
28 | endif | 28 | endif |
diff --git a/src/gns/nss/Makefile.am b/src/gns/nss/Makefile.am index 62da7109a..2551b9562 100644 --- a/src/gns/nss/Makefile.am +++ b/src/gns/nss/Makefile.am | |||
@@ -60,7 +60,7 @@ libnss_gns6_la_LDFLAGS=$(libnss_gns_la_LDFLAGS) | |||
60 | if INSTALL_NSS | 60 | if INSTALL_NSS |
61 | if !MINGW | 61 | if !MINGW |
62 | install-data-hook: | 62 | install-data-hook: |
63 | $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(nssdir) $(SUDO_BINARY) | 63 | $(top_srcdir)/src/gns/nss/install-nss-plugin.sh $(SHELL) $(top_builddir) $(DESTDIR)$(nssdir) $(SUDO_BINARY) |
64 | 64 | ||
65 | uninstall-hook: | 65 | uninstall-hook: |
66 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY) | 66 | $(top_srcdir)/src/gns/nss/uninstall-nss-plugin.sh $(SHELL) $(top_builddir) "rm -f $(nssdir)/libnss_gns.so.2" $(SUDO_BINARY) |
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am index 0fde4c22d..5e89ac24d 100644 --- a/src/nat/Makefile.am +++ b/src/nat/Makefile.am | |||
@@ -20,14 +20,14 @@ if LINUX | |||
20 | NATSERVER = gnunet-helper-nat-server.c | 20 | NATSERVER = gnunet-helper-nat-server.c |
21 | NATCLIENT = gnunet-helper-nat-client.c | 21 | NATCLIENT = gnunet-helper-nat-client.c |
22 | install-exec-hook: | 22 | install-exec-hook: |
23 | $(top_srcdir)/src/nat/install-nat-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 23 | $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true |
24 | else | 24 | else |
25 | if XFREEBSD | 25 | if XFREEBSD |
26 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client | 26 | NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client |
27 | NATSERVER = gnunet-helper-nat-server.c | 27 | NATSERVER = gnunet-helper-nat-server.c |
28 | NATCLIENT = gnunet-helper-nat-client.c | 28 | NATCLIENT = gnunet-helper-nat-client.c |
29 | install-exec-hook: | 29 | install-exec-hook: |
30 | $(top_srcdir)/src/nat/install-nat-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 30 | $(top_srcdir)/src/nat/install-nat-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true |
31 | endif | 31 | endif |
32 | else | 32 | else |
33 | install-exec-hook: | 33 | install-exec-hook: |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 950b0a9a0..001681181 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -95,9 +95,9 @@ endif | |||
95 | 95 | ||
96 | if LINUX | 96 | if LINUX |
97 | install-exec-hook: | 97 | install-exec-hook: |
98 | $(top_srcdir)/src/transport/install-wlan-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 98 | $(top_srcdir)/src/transport/install-wlan-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true |
99 | if HAVE_LIBBLUETOOTH | 99 | if HAVE_LIBBLUETOOTH |
100 | $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 100 | $(top_srcdir)/src/transport/install-bluetooth-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true |
101 | endif | 101 | endif |
102 | else | 102 | else |
103 | install-exec-hook: | 103 | install-exec-hook: |
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 47bee896d..5517a45e3 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -22,7 +22,7 @@ pkgcfg_DATA = \ | |||
22 | if LINUX | 22 | if LINUX |
23 | VPNBIN = gnunet-helper-vpn | 23 | VPNBIN = gnunet-helper-vpn |
24 | install-exec-hook: | 24 | install-exec-hook: |
25 | $(top_srcdir)/src/vpn/install-vpn-helper.sh $(libexecdir) $(SUDO_BINARY) || true | 25 | $(top_srcdir)/src/vpn/install-vpn-helper.sh $(DESTDIR)$(libexecdir) $(SUDO_BINARY) || true |
26 | else | 26 | else |
27 | install-exec-hook: | 27 | install-exec-hook: |
28 | endif | 28 | endif |