server/admin.c: Remove spurious `ping' in usage message.

[tripe] / init / Makefile.am

diff --git a/init/Makefile.am b/init/Makefile.am
index 2d52819147f42bacf0b5e9438a9dd9b8c74bc489..469d465285c6b5ef42f4f0c78ceead30d5b0c5e4 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -9,19 +9,18 @@
 ###
 ### This file is part of Trivial IP Encryption (TrIPE).
 ###
-### TrIPE is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### TrIPE is free software: you can redistribute it and/or modify it under
+### the terms of the GNU General Public License as published by the Free
+### Software Foundation; either version 3 of the License, or (at your
+### option) any later version.
 ###
-### TrIPE is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
+### TrIPE is distributed in the hope that it will be useful, but WITHOUT
+### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+### FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+### for more details.
 ###
 ### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 include $(top_srcdir)/vars.am
 
@@ -37,16 +36,24 @@ EXTRA_DIST          += tripe-init.in
 CLEANFILES             += tripe-init
 
 tripe-init: tripe-init.in Makefile
-       $(confsubst) $(srcdir)/tripe-init.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/tripe-init.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 ## Configuration file for the script.
 EXTRA_DIST             += tripe.conf
+install-data-local:: tripe.conf
+       initconfig=$(initconfig) && dir=$${initconfig%/*} && \
+               $(MKDIR_P) $(DESTDIR)$$dir
+       test -f $(DESTDIR)$(initconfig) || \
+               $(INSTALL_DATA) $(srcdir)/tripe.conf \
+                       $(DESTDIR)$(initconfig)
+uninstall-local::
+       rm -f $(DESTDIR)$(initconfig)
 
 ## Necessary directories.
-install-hook:
+install-data-hook::
        for i in "$(configdir)" "$(socketdir)"; do \
-         case "$$i" in /*) $(mkdir_p) $(DESTDIR)$$i ;; esac; \
+         case "$$i" in /*) $(MKDIR_P) $(DESTDIR)$$i ;; esac; \
        done
 
 ###----- That's all, folks --------------------------------------------------