Make the bindist AC_INIT line match the main configure script's

This means that PACKAGE_TARNAME gets set, so the default docdir is
correct.

diff --git a/configure.ac b/configure.ac
index fb186ca..3fb728b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -838,7 +838,7 @@ if grep '   ' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss distrib/configure-bin.ac])
 AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h])
 AC_OUTPUT
 

diff --git a/distrib/configure-bin.ac b/distrib/configure-bin.ac.in
similarity index 92%
rename from distrib/configure-bin.ac
rename to distrib/configure-bin.ac.in
index 425e906..de306a9 100644 (file)
--- a/distrib/configure-bin.ac
+++ b/distrib/configure-bin.ac.in
@@ -4,8 +4,7 @@ dnl
 #!/bin/sh
 #
 
-# Is it there?
-AC_INIT(mk/config.mk.in)
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [@ProjectVersion@], [glasgow-haskell-bugs@haskell.org], [ghc])
 
 FP_FIND_ROOT