confsubst: Rename to confsubst.in and substitute.

Otherwise it has @VERSION@ crud in it!

diff --git a/Makefile.am b/Makefile.am
index 29080c22feb172f3f419cf7dbacf736128ea0733..7ca039dd8fbcde3ec7346f8d6f56d51be3f8209f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ CLEANFILES             =
 ###--------------------------------------------------------------------------
 ### Handy variables.
 
 ###--------------------------------------------------------------------------
 ### Handy variables.
 

-confsubst = $(srcdir)/confsubst
+confsubst = $(srcdir)/confsubst.in

 mkdir_p = $(srcdir)/config/install-sh -d
 
 ###--------------------------------------------------------------------------
 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
 ## Scripts.
 pkgdata_SCRIPTS                += install-ac
 pkgdata_SCRIPTS                += maninst

+
+## confsubst

 pkgdata_SCRIPTS                += 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
 
 ## Testsuites.
 pkgdata_DATA           += autotest.am

diff --git a/confsubst b/confsubst.in
similarity index 99%
rename from confsubst
rename to confsubst.in
index 45a85c247b06b392b76af90f421e3a075a6afdab..86c8bb0e3b99041f66bfae0e372449d5036b1455 100755 (executable)
--- a/confsubst
+++ b/confsubst.in
@@ -25,7 +25,6 @@
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 set -e
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 set -e

-

 VERSION="@VERSION@"
 
 ###--------------------------------------------------------------------------
 VERSION="@VERSION@"
 
 ###--------------------------------------------------------------------------