fix for @PACKAGE_NAME@, @VERSION@, and @PACKAGE@

This commit is contained in:
Lars J. Aas 2001-04-10 12:45:10 +00:00
parent d35407c9a7
commit 5ff5328ee4
3 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2001-04-10 Lars J. Aas <larsa@sim.no>
* 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 <larsa@sim.no> 2001-04-10 Lars J. Aas <larsa@sim.no>
* acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Re-enable logging to * acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Re-enable logging to

View File

@ -30,12 +30,6 @@ WGET = wget
bin_SCRIPTS = autoconf autoheader autoreconf ifnames @PERLSCRIPTS@ bin_SCRIPTS = autoconf autoheader autoreconf ifnames @PERLSCRIPTS@
EXTRA_SCRIPTS = autoscan autoupdate 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: # FIXME:
# s/distpackageDATA/dist_pkgdata_DATA/ # s/distpackageDATA/dist_pkgdata_DATA/
# s/nodistpackageDATA/nodist_pkgdata_DATA/ # s/nodistpackageDATA/nodist_pkgdata_DATA/

View File

@ -43,6 +43,12 @@ if test -f $srcdir/standards.texi; then
AC_SUBST(standards_texi, standards.texi)dnl AC_SUBST(standards_texi, standards.texi)dnl
fi 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 AC_OUTPUT(Makefile m4/Makefile man/Makefile doc/Makefile
tests/Makefile tests/atconfig) tests/Makefile tests/atconfig)