From cac38f7fe315b2869985b49beaca4677c568b853 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sun, 21 Dec 2008 20:10:09 +0000 Subject: [PATCH] confsubst: Rename to confsubst.in and substitute. Otherwise it has @VERSION@ crud in it! --- Makefile.am | 12 +++++++++++- confsubst => confsubst.in | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) rename confsubst => confsubst.in (99%) diff --git a/Makefile.am b/Makefile.am index 29080c2..7ca039d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ CLEANFILES = ###-------------------------------------------------------------------------- ### Handy variables. -confsubst = $(srcdir)/confsubst +confsubst = $(srcdir)/confsubst.in mkdir_p = $(srcdir)/config/install-sh -d ###-------------------------------------------------------------------------- @@ -83,7 +83,17 @@ pkgdata_DATA += getdate.y getdate.h ## Scripts. pkgdata_SCRIPTS += install-ac pkgdata_SCRIPTS += maninst + +## confsubst pkgdata_SCRIPTS += confsubst +CLEANFILES += confsubst +EXTRA_DIST += confsubst.in + +confsubst: confsubst.in Makefile + $(confsubst) $(srcdir)/confsubst.in >$@.new \ + VERSION=$(VERSION) + chmod +x $@.new + mv $@.new $@ ## Testsuites. pkgdata_DATA += autotest.am diff --git a/confsubst b/confsubst.in similarity index 99% rename from confsubst rename to confsubst.in index 45a85c2..86c8bb0 100755 --- a/confsubst +++ b/confsubst.in @@ -25,7 +25,6 @@ ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. set -e - VERSION="@VERSION@" ###-------------------------------------------------------------------------- -- 2.11.0