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:
+pkghello_DATA = \
-        $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
+  DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0
-        @$(NORMAL_INSTALL)
-        for hello in $(srcdir)/hellos/*; do \
-          if test -f $$hello; then \
-            $(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \
-          fi \
-        done
-dist-hook:
+EXTRA_DIST =
-        if test -d $(srcdir)/hellos; then \
+  $(pkghello_DATA)
-          mkdir -p $(distdir)/hellos; \
-          for hello in $(srcdir)/hellos/*; do \
-            if test -f $$hello; then \
-              cp -p $$hello $(distdir)/hellos; \
-            fi \
-          done \
-        fi
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:
+pkginit_DATA = \
-        $(mkinstalldirs) $(DESTDIR)$(pkginitdir)
+  gnunet.initd
-        @$(NORMAL_INSTALL)
-    $(INSTALL_DATA) gnunet.initd $(DESTDIR)$(pkginitdir)
+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:
+pkginit_DATA = \
-        $(mkinstalldirs) $(DESTDIR)$(pkginitdir)
+  gnunet.service
-        @$(NORMAL_INSTALL)
-    $(INSTALL_DATA) gnunet.service $(DESTDIR)$(pkginitdir)
+EXTRA_DIST = \
+  $(pkginit_DATA)

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 @@
1	# This Makefile.am is in the public domain
2
3	pkghellodir= $(pkgdatadir)/hellos	1	pkghellodir= $(pkgdatadir)/hellos
4		2
5	install-data-local:	3	pkghello_DATA = \
6	$(mkinstalldirs) $(DESTDIR)$(pkghellodir)	4	DSTJBRRKZ8TBW3FGK6B0M5QXWT9WYNZ45H5MCV4HY7ST64Q8T9F0
7	@$(NORMAL_INSTALL)
8	for hello in $(srcdir)/hellos/*; do \
9	if test -f $$hello; then \
10	$(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \
11	fi \
12	done
13		5
14	dist-hook:	6	EXTRA_DIST =
15	if test -d $(srcdir)/hellos; then \	7	$(pkghello_DATA)
16	mkdir -p $(distdir)/hellos; \
17	for hello in $(srcdir)/hellos/*; do \
18	if test -f $$hello; then \
19	cp -p $$hello $(distdir)/hellos; \
20	fi \
21	done \
22	fi


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 @@
1	pkginitddir= $(pkgdatadir)/services/openrc	1	pkginitdir= $(pkgdatadir)/services/openrc
2		2
3	install-data-local:	3	pkginit_DATA = \
4	$(mkinstalldirs) $(DESTDIR)$(pkginitdir)	4	gnunet.initd
5	@$(NORMAL_INSTALL)	5
6	$(INSTALL_DATA) gnunet.initd $(DESTDIR)$(pkginitdir)	6	EXTRA_DIST = \
		7	$(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 @@
1	pkginitddir= $(pkgdatadir)/services/systemd	1	pkginitdir= $(pkgdatadir)/services/systemd
2		2
3	install-data-local:	3	pkginit_DATA = \
4	$(mkinstalldirs) $(DESTDIR)$(pkginitdir)	4	gnunet.service
5	@$(NORMAL_INSTALL)	5
6	$(INSTALL_DATA) gnunet.service $(DESTDIR)$(pkginitdir)	6	EXTRA_DIST = \
		7	$(pkginit_DATA)