server/tests.at (server retry): Use the new `WITH_STRACE' macro.

[tripe] / init / Makefile.am

diff --git a/init/Makefile.am b/init/Makefile.am
index a37214fd90ed8c7fdc48ddd8034aa3fa2e6c70ae..58af5d44ef0eeb93d438cbaf6b4a253bf4edf55a 100644 (file)
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -37,16 +37,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-data-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 --------------------------------------------------