1 files changed, 12 insertions, 37 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index d83fb8846..ff1d1fbbb 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -5,13 +5,7 @@ tap32dir = $(pkgdatadir)/openvpn-tap32/tapw32/
 
 tap64dir = $(pkgdatadir)/openvpn-tap32/tapw64/
 
-noinst_SCRIPTS = \
- scripts/terminate.py \
- scripts/pydiffer.py \
- scripts/removetrailingwhitespace.py \
- scripts/gnunet_pyexpect.py \
- scripts/gnunet_janitor.py \
- scripts/gnunet-chk.py
+SUBDIRS = scripts
 
 dist_pkgdata_DATA = \
  gns/gns-bcd.html \
@@ -35,6 +29,10 @@ tap64_DATA = \
  3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf
 endif
 
+INITD_FILES = \
+ services/openrc/gnunet.initd \
+ services/systemd/gnunet.service
+
 EXTRA_DIST = \
  conf/colorit/colorit.conf \
  conf/editors/eclipse/gnunet_codingstyle.xml \
@@ -42,14 +40,6 @@ EXTRA_DIST = \
  conf/gnunet/no_autostart_above_core.conf \
  conf/nss/nssswitch.conf \
  conf/wireshark/wireshark.lua \
- scripts/coverage.sh \
- scripts/terminate.py.in \
- scripts/gnunet_pyexpect.py.in \
- scripts/gnunet_janitor.py.in \
- scripts/gnunet-chk.py.in \
- scripts/gnunet-bugreport \
- scripts/removetrailingwhitespace.py.in \
- scripts/pydiffer.py.in \
  packages/nix/default.nix \
  packages/nix/gnunet-dev.nix \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
@@ -60,28 +50,8 @@ EXTRA_DIST = \
  3rdparty/Windows/openvpn-tap32/tapw64/OemWin2k.inf \
  3rdparty/Windows/openvpn-tap32/INSTALL \
  3rdparty/Windows/openvpn-tap32/tap32-signed-i386-2.1.zip \
- 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip
-
-CLEANFILES = \
-  $(noinst_SCRIPTS)
-
-do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g'
-
-# Use SUFFIX Extension rules, they are more portable for every
-# implementation of 'make'.
-# You'll also run into the "'%' is a GNU make extension warning"
-# if you use this:
-#
-#%.py: %.py.in Makefile
-#       $(do_subst) < $< > $@
-#       chmod +x $@
-#
-# instead of this:
-SUFFIXES = .py.in .py
-
-.py.in.py:
-        $(do_subst) < $< > $@
-        chmod +x $@
+ 3rdparty/Windows/openvpn-tap32/tap32-source-2.1.zip \
+ $(INITD_FILES)
 
 check_PROGRAMS = \
  test_gnunet_prefix
@@ -104,6 +74,7 @@ test_gnunet_prefix_LDADD = \
   $(LIBLTDL) -lunistring $(XLIB)
 
 pkghellodir= $(pkgdatadir)/hellos
+pkginitddir= $(pkgdatadir)/services
 
 install-data-local:
         $(mkinstalldirs) $(DESTDIR)$(pkghellodir)
@@ -114,6 +85,10 @@ install-data-local:
           fi \
         done
         install scripts/gnunet-bugreport $(DESTDIR)$(bindir)/gnunet-bugreport
+        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 \