diff options
author | David Barksdale <amatus.amongus@gmail.com> | 2015-06-23 13:53:17 +0000 |
---|---|---|
committer | David Barksdale <amatus.amongus@gmail.com> | 2015-06-23 13:53:17 +0000 |
commit | 69bf12b84054dcbde84fb07eaa9bb9e5d60f1355 (patch) | |
tree | 3cf758cdc37ee7792a9076f28e6d5ef727e52642 | |
parent | 93c241c65dfcd0ffba7852740fb34a4c3249b52b (diff) | |
download | gnunet-69bf12b84054dcbde84fb07eaa9bb9e5d60f1355.tar.gz gnunet-69bf12b84054dcbde84fb07eaa9bb9e5d60f1355.zip |
Fix installation of sensors when DESTDIR is used
Also include sensors in distribution tarball.
This fixes issue #3859.
-rw-r--r-- | src/sensor/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sensor/Makefile.am b/src/sensor/Makefile.am index fc622cef7..b62885d0c 100644 --- a/src/sensor/Makefile.am +++ b/src/sensor/Makefile.am | |||
@@ -129,11 +129,12 @@ perf_pow_sign_LDADD = \ | |||
129 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 129 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
130 | libgnunetsensorutil.la | 130 | libgnunetsensorutil.la |
131 | 131 | ||
132 | EXTRA_DIST = sensors | ||
132 | pkgsensordir = sensors | 133 | pkgsensordir = sensors |
133 | 134 | ||
134 | install-data-local: | 135 | install-data-local: |
135 | $(mkinstalldirs) $(datadir)/$(PACKAGE)/$(pkgsensordir) | 136 | $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/$(pkgsensordir) |
136 | @$(NORMAL_INSTALL) | 137 | @$(NORMAL_INSTALL) |
137 | for sensor in $(pkgsensordir)/*; do \ | 138 | for sensor in $(pkgsensordir)/*; do \ |
138 | cp -a $$sensor $(datadir)/$(PACKAGE)/$(pkgsensordir)/ ; \ | 139 | cp -a $$sensor $(DESTDIR)$(datadir)/$(PACKAGE)/$(pkgsensordir)/ ; \ |
139 | done | 140 | done |