From 5ff5328ee4571a921f91389e2151703b8bbcccdf Mon Sep 17 00:00:00 2001 From: "Lars J. Aas" Date: Tue, 10 Apr 2001 12:45:10 +0000 Subject: [PATCH] fix for @PACKAGE_NAME@, @VERSION@, and @PACKAGE@ --- ChangeLog | 6 ++++++ Makefile.am | 6 ------ configure.in | 6 ++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f455be79..519961be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-10 Lars J. Aas + + * Makefile.am: AC_SUBST fixes for PACKAGE_NAME, VERSION, PACKAGE... + * configure.in: Moved here. + Suggested by Akim Demaille and Raja R Harinath. + 2001-04-10 Lars J. Aas * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Re-enable logging to diff --git a/Makefile.am b/Makefile.am index 57a976c6..60a3d20a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,12 +30,6 @@ WGET = wget bin_SCRIPTS = autoconf autoheader autoreconf ifnames @PERLSCRIPTS@ EXTRA_SCRIPTS = autoscan autoupdate -# FIXME: Current Automakes are blind and cannot see inner AC_SUBST, -# so help it. This is because, in this case, 'aclocal' is bypassed. -PACKAGE_NAME = @PACKAGE_NAME@ -VERSION = @VERSION@ -PACKAGE = @PACKAGE@ - # FIXME: # s/distpackageDATA/dist_pkgdata_DATA/ # s/nodistpackageDATA/nodist_pkgdata_DATA/ diff --git a/configure.in b/configure.in index a0b8de08..206c3457 100644 --- a/configure.in +++ b/configure.in @@ -43,6 +43,12 @@ if test -f $srcdir/standards.texi; then AC_SUBST(standards_texi, standards.texi)dnl fi +# Automake can't see inner AC_SUBSTS (`aclocal' is bypassed), so we tag the +# AC_SUBSTS here too. +AC_SUBST(PACKAGE_NAME) +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) + AC_OUTPUT(Makefile m4/Makefile man/Makefile doc/Makefile tests/Makefile tests/atconfig)