Merge branch 'master' of gnunet.org:gnunet

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)

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)

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)