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

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.

GUILE-VERSION

@@ -7,10 +7,6 @@ GUILE_MICRO_VERSION=5
 GUILE_EFFECTIVE_VERSION=${GUILE_MAJOR_VERSION}.${GUILE_MINOR_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
 # 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

Makefile.am

@@ -40,10 +40,6 @@ ACLOCAL_AMFLAGS = -I m4
 
 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
 
 dist-hook: gen-ChangeLog

configure.ac

@@ -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  the output.
 dnl
-AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[
-]),
+AC_INIT([GNU Guile],
         patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
 ]),
         [bug-guile@gnu.org])
@@ -1544,20 +1543,9 @@ AC_SUBST(top_builddir_absolute)
 top_srcdir_absolute=`(cd $srcdir && pwd)`
 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 Note: `sitedir' must be kept in sync with `GUILE_SITE_DIR' in `guile.m4'.
+pkgdatadir="$datadir/$PACKAGE_TARNAME"
 sitedir="$pkgdatadir/site"
 AC_SUBST([sitedir])