From 8066838aa14adf2371f6e1745424c3b6baa6d164 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 4 Oct 2009 10:39:08 +0000 Subject: [PATCH] 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. --- configure.ac | 2 +- distrib/{configure-bin.ac => configure-bin.ac.in} | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename distrib/{configure-bin.ac => configure-bin.ac.in} (92%) diff --git a/configure.ac b/configure.ac index fb186ca..3fb728b 100644 --- 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 --- 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 -- 1.7.10.4