From 44eaf653f18839f931d348d2a2f40d94b24b8836 Mon Sep 17 00:00:00 2001 From: Richard Hansen Date: Tue, 30 Jun 2020 13:27:08 -0400 Subject: [PATCH] Rename `*.template` to `*.in` Apparently the `.template` extension is commonly used in macOS for a word processor template file. See issue #206. --- Makefile.am | 12 ++++++------ configure.ac | 2 +- ddclient.conf.template => ddclient.conf.in | 0 ddclient.template => ddclient.in | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename ddclient.conf.template => ddclient.conf.in (100%) rename ddclient.template => ddclient.in (100%) diff --git a/Makefile.am b/Makefile.am index d0970e8..65bf402 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,23 +32,23 @@ subst = sed \ -e 's|@runstatedir[@]|$(runstatedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' -# Files that will be generated by passing their *.template file -# through $(subst). +# Files that will be generated by passing their *.in file through +# $(subst). subst_files = ddclient ddclient.conf -EXTRA_DIST += $(subst_files:=.template) +EXTRA_DIST += $(subst_files:=.in) CLEANFILES += $(subst_files) $(subst_files): Makefile rm -f '$@' '$@'.tmp - in='$@'.template; \ + in='$@'.in; \ test -f "$${in}" || in='$(srcdir)/'$${in}; \ $(subst) "$${in}" >'$@'.tmp && \ { ! test -x "$${in}" || chmod +x '$@'.tmp; } mv '$@'.tmp '$@' -ddclient: $(srcdir)/ddclient.template -ddclient.conf: $(srcdir)/ddclient.conf.template +ddclient: $(srcdir)/ddclient.in +ddclient.conf: $(srcdir)/ddclient.conf.in bin_SCRIPTS = ddclient diff --git a/configure.ac b/configure.ac index 30e8019..cb21dd1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([ddclient], [3.9.1]) -AC_CONFIG_SRCDIR([ddclient.template]) +AC_CONFIG_SRCDIR([ddclient.in]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) diff --git a/ddclient.conf.template b/ddclient.conf.in similarity index 100% rename from ddclient.conf.template rename to ddclient.conf.in diff --git a/ddclient.template b/ddclient.in similarity index 100% rename from ddclient.template rename to ddclient.in