clean up gnunet-bugreport by installing it properly

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ff1d1fbbb6138950e5378f5f44f906f6e3fa0e41..82aebed99c0fe4c21383d4f468e6fdadfb9d51d5 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -84,7 +84,6 @@ install-data-local:
            $(INSTALL_DATA) $$hello $(DESTDIR)$(pkghellodir)/ ; \
          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/

diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
index a9eadf3373b50f5724e1863526308467f9bac61c..5dc94439b41bcf82315f233f96da767fcf98affb 100644 (file)
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -11,13 +11,16 @@ noinst_SCRIPTS = \
  gnunet_janitor.py \
  gnunet-chk.py
 
+bin_SCRIPTS = \
+ gnunet-bugreport
+
 EXTRA_DIST = \
  coverage.sh \
  terminate.py.in \
  gnunet_pyexpect.py.in \
  gnunet_janitor.py.in \
  gnunet-chk.py.in \
- gnunet-bugreport \
+ $(SCRIPTS) \
  removetrailingwhitespace.py.in \
  pydiffer.py.in