From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 6 Apr 2019 15:01:46 +0000 (+0200)
Subject: fix #5676
X-Git-Tag: v0.11.3~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a15e470f0d6af177d2f699ce5dbd2c549a73ff59;p=oweals%2Fgnunet.git

fix #5676
---

diff --git a/configure.ac b/configure.ac
index c8f7209f3..aeb3520dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1852,6 +1852,10 @@ AC_DEFINE_UNQUOTED(VCS_VERSION, [$vcs_version], [VCS revision/hash or tarball ve
 AC_CONFIG_FILES([
 Makefile
 contrib/Makefile
+contrib/hellos/Makefile
+contrib/services/Makefile
+contrib/services/openrc/Makefile
+contrib/services/systemd/Makefile
 contrib/scripts/Makefile
 contrib/scripts/gnunet-logread/Makefile
 doc/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 82aebed99..c78b6fe9d 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,7 +5,7 @@ tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
 
 tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/
 
-SUBDIRS = scripts
+SUBDIRS = scripts hellos services
 
 dist_pkgdata_DATA = \
  gns/gns-bcd.html \
@@ -72,29 +72,3 @@ test_gnunet_prefix_LDADD = \
   $(LTLIBICONV) \
   $(GN_LIBINTL) \
   $(LIBLTDL) -lunistring $(XLIB)
-
-pkghellodir= $(pkgdatadir)/hellos
-pkginitddir= $(pkgdatadir)/services
-
-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
-	mkdir -p $(DESTDIR)$(pkgdatadir)/services/openrc
-	mkdir -p $(DESTDIR)$(pkgdatadir)/services/systemd
-	install services/openrc/gnunet.initd $(DESTDIR)$(pkginitddir)/openrc/
-	install services/systemd/gnunet.service $(DESTDIR)$(pkginitddir)/systemd/
-
-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