summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-04-06 15:39:14 +0000
committerng0 <ng0@n0.is>2019-04-06 15:39:14 +0000
commitd3ef5a11f622af93e2a6581d7b2470762c1fc384 (patch)
tree8defe15a43689ed317a8fe4c6a14e62d7c31f4f2
parent09cb17e77bf978b2c449f572aa5a227ebf9ba8e9 (diff)
parent869af37a6336b27ffb7ed560018e81a214c40664 (diff)
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r--contrib/hellos/Makefile.am23
-rw-r--r--contrib/services/openrc/Makefile.am11
-rw-r--r--contrib/services/systemd/Makefile.am11
3 files changed, 16 insertions, 29 deletions
diff --git a/contrib/hellos/Makefile.am b/contrib/hellos/Makefile.am
index 18a6458fe..d498d57e7 100644
--- a/contrib/hellos/Makefile.am
+++ b/contrib/hellos/Makefile.am
@@ -1,22 +1,7 @@
-# This Makefile.am is in the public domain
-
pkghellodir= $(pkgdatadir)/hellos
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
- @$(NORMAL_INSTALL)
- for hello in $(srcdir)/hellos/*; do \
- if test -f $$hello; then \
- $(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \
- fi \
- done
+pkghello_DATA = \
+ DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0
-dist-hook:
- if test -d $(srcdir)/hellos; then \
- mkdir -p $(distdir)/hellos; \
- for hello in $(srcdir)/hellos/*; do \
- if test -f $$hello; then \
- cp -p $$hello $(distdir)/hellos; \
- fi \
- done \
- fi
+EXTRA_DIST =
+ $(pkghello_DATA)
diff --git a/contrib/services/openrc/Makefile.am b/contrib/services/openrc/Makefile.am
index a02854384..3cd57dac7 100644
--- a/contrib/services/openrc/Makefile.am
+++ b/contrib/services/openrc/Makefile.am
@@ -1,6 +1,7 @@
-pkginitddir= $(pkgdatadir)/services/openrc
+pkginitdir= $(pkgdatadir)/services/openrc
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkginitdir)
- @$(NORMAL_INSTALL)
- $(INSTALL_DATA) gnunet.initd $(DESTDIR)$(pkginitdir)
+pkginit_DATA = \
+ gnunet.initd
+
+EXTRA_DIST = \
+ $(pkginit_DATA)
diff --git a/contrib/services/systemd/Makefile.am b/contrib/services/systemd/Makefile.am
index 7120f6f52..39a6f2a81 100644
--- a/contrib/services/systemd/Makefile.am
+++ b/contrib/services/systemd/Makefile.am
@@ -1,6 +1,7 @@
-pkginitddir= $(pkgdatadir)/services/systemd
+pkginitdir= $(pkgdatadir)/services/systemd
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pkginitdir)
- @$(NORMAL_INSTALL)
- $(INSTALL_DATA) gnunet.service $(DESTDIR)$(pkginitdir)
+pkginit_DATA = \
+ gnunet.service
+
+EXTRA_DIST = \
+ $(pkginit_DATA)