mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Remove conflicting definition of $PACKAGE from `GUILE-VERSION'.

Browse source 
This obviates the need for the previous commit,
53da7372be.

* GUILE-VERSION (VERSION, PACKAGE): Remove.  The latter was conflicting
  with Automake's definition, which is "guile", not "GNU Guile".

* Makefile.am (distdir): Remove.

* configure.ac: Hardcode the package name passed to `AC_INIT'.
  (pkgdatadir, pkgincludedir, pkglibdir, pkglibexecdir): Remove.
This commit is contained in:
Ludovic Courtès 2009-11-18 14:59:33 +01:00
parent 53da7372be
commit 0c1eb9b68c
3 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GUILE-VERSION
View file

@ -7,10 +7,6 @@ GUILE_MICRO_VERSION=5
GUILE_EFFECTIVE_VERSION=${GUILE_MAJOR_VERSION}.${GUILE_MINOR_VERSION} GUILE_EFFECTIVE_VERSION=${GUILE_MAJOR_VERSION}.${GUILE_MINOR_VERSION}
GUILE_VERSION=${GUILE_EFFECTIVE_VERSION}.${GUILE_MICRO_VERSION} GUILE_VERSION=${GUILE_EFFECTIVE_VERSION}.${GUILE_MICRO_VERSION}
# For automake.
VERSION=${GUILE_VERSION}
PACKAGE="GNU Guile"
# All of the shared lib versioning info. Right now, for this to work # All of the shared lib versioning info. Right now, for this to work
# properly, you'll also need to add AC_SUBST calls to the right place # properly, you'll also need to add AC_SUBST calls to the right place
# in configure.in, add the right -version-info statement to your # in configure.in, add the right -version-info statement to your

4
Makefile.am
View file

@ -40,10 +40,6 @@ ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES = check-guile.log DISTCLEANFILES = check-guile.log
# Help Automake choose the right directory name (Automake 1.11 uses
# `$(PACKAGE)-$(PACKAGE_VERSION)' by default, which is wrong.)
distdir = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning DISTCHECK_CONFIGURE_FLAGS = --enable-error-on-warning
dist-hook: gen-ChangeLog dist-hook: gen-ChangeLog

16
configure.ac
View file

@ -32,8 +32,7 @@ dnl "echo -n" since -n is not portable (see autoconf manual "Limitations of
dnl Builtins"), in particular on solaris it results in a literal "-n" in dnl Builtins"), in particular on solaris it results in a literal "-n" in
dnl the output. dnl the output.
dnl dnl
AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[ AC_INIT([GNU Guile],
]),
patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[ patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
]), ]),
[bug-guile@gnu.org]) [bug-guile@gnu.org])
@ -1544,20 +1543,9 @@ AC_SUBST(top_builddir_absolute)
top_srcdir_absolute=`(cd $srcdir && pwd)` top_srcdir_absolute=`(cd $srcdir && pwd)`
AC_SUBST(top_srcdir_absolute) AC_SUBST(top_srcdir_absolute)
dnl Override Automake 1.11's broken definitions.
dnl See http://thread.gmane.org/gmane.comp.sysutils.automake.bugs/4803
dnl and info "(automake) Uniform" and info "(autoconf) Initializing configure".
pkgdatadir="$datadir/$PACKAGE_TARNAME"
pkgincludedir="$includedir/$PACKAGE_TARNAME"
pkglibdir="$libdir/$PACKAGE_TARNAME"
pkglibexecdir="$libexecdir/$PACKAGE_TARNAME"
AC_SUBST([pkgdatadir])
AC_SUBST([pkgincludedir])
AC_SUBST([pkglibdir])
AC_SUBST([pkglibexecdir])
dnl We need `sitedir' in `guile-1.8.pc'. dnl We need `sitedir' in `guile-1.8.pc'.
dnl Note: `sitedir' must be kept in sync with `GUILE_SITE_DIR' in `guile.m4'. dnl Note: `sitedir' must be kept in sync with `GUILE_SITE_DIR' in `guile.m4'.
pkgdatadir="$datadir/$PACKAGE_TARNAME"
sitedir="$pkgdatadir/site" sitedir="$pkgdatadir/site"
AC_SUBST([sitedir]) AC_SUBST([sitedir])