summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-11-18 14:59:33 +0100
committerLudovic Courtès <ludo@gnu.org>2009-11-18 14:59:33 +0100
commit0c1eb9b68c7759383340c3f91517c7f7a87fc559 (patch)
tree8de34d14d80cbb9f629034081bc227a49d7caeee /Makefile.am
parent53da7372beca90a58b7401a84627815289a53d11 (diff)
downloadguile-0c1eb9b68c7759383340c3f91517c7f7a87fc559.tar.gz
Remove conflicting definition of $PACKAGE from `GUILE-VERSION'.
This obviates the need for the previous commit, 53da7372beca90a58b7401a84627815289a53d11. * 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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 1ee3e80f8..06c5b3870 100644
--- a/Makefile.am
+++ b/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