|
|
|
|
Index: Makefile.in
|
|
|
|
|
--- Makefile.in.orig 2003-12-10 19:35:11.000000000 +0100
|
|
|
|
|
+++ Makefile.in 2003-12-11 09:12:47.000000000 +0100
|
|
|
|
|
@@ -68,7 +68,7 @@
|
|
|
|
|
CTAGS = ctags
|
|
|
|
|
DIST_SUBDIRS = $(SUBDIRS)
|
|
|
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
|
|
|
-distdir = $(PACKAGE)-$(VERSION)
|
|
|
|
|
+distdir = $(PACKAGE)
|
|
|
|
|
top_distdir = $(distdir)
|
|
|
|
|
am__remove_distdir = \
|
|
|
|
|
{ test ! -d $(distdir) \
|
|
|
|
|
Index: aclocal.in
|
|
|
|
|
--- aclocal.in.orig 2003-12-05 22:19:39.000000000 +0100
|
|
|
|
|
+++ aclocal.in 2003-12-11 09:11:05.000000000 +0100
|
|
|
|
|
@@ -29,7 +29,7 @@
|
|
|
|
|
|
|
|
|
|
BEGIN
|
|
|
|
|
{
|
|
|
|
|
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
|
|
|
|
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
|
|
|
|
|
unshift @INC, (split ':', $perllibdir);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -519,12 +519,6 @@
|
|
|
|
|
$default_dirlist="$acdir/dirlist"
|
|
|
|
|
if $acdir ne $default_acdir;
|
|
|
|
|
|
|
|
|
|
- # Search the versioned directory near the end, and then the
|
|
|
|
|
- # unversioned directory last. Only do this if the user didn't
|
|
|
|
|
- # override acdir.
|
|
|
|
|
- push (@dirlist, "$acdir-$APIVERSION")
|
|
|
|
|
- if $acdir eq $default_acdir;
|
|
|
|
|
-
|
|
|
|
|
# By default $(datadir)/aclocal doesn't exist. We don't want to
|
|
|
|
|
# get an error in the case where we are searching the default
|
|
|
|
|
# directory and it hasn't been created.
|
|
|
|
|
Index: automake.in
|
|
|
|
|
--- automake.in.orig 2003-12-08 18:53:57.000000000 +0100
|
|
|
|
|
+++ automake.in 2003-12-11 09:12:04.000000000 +0100
|
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
|
|
|
|
|
|
BEGIN
|
|
|
|
|
{
|
|
|
|
|
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
|
|
|
|
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
|
|
|
|
|
unshift @INC, (split ':', $perllibdir);
|
|
|
|
|
|
|
|
|
|
# Override SHELL. This is required on DJGPP so that system() uses
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2003-12-10 19:35:10.000000000 +0100
|
|
|
|
|
+++ configure 2003-12-11 09:08:23.000000000 +0100
|
|
|
|
|
@@ -1710,7 +1710,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# A versioned directory, defined here for convenience.
|
|
|
|
|
-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
|
|
|
|
|
+pkgvdatadir="\${datadir}/automake"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
|
|
|
|
|
Index: m4/Makefile.in
|
|
|
|
|
--- m4/Makefile.in.orig 2003-12-10 19:35:12.000000000 +0100
|
|
|
|
|
+++ m4/Makefile.in 2003-12-11 09:09:07.000000000 +0100
|
|
|
|
|
@@ -119,7 +119,7 @@
|
|
|
|
|
sharedstatedir = @sharedstatedir@
|
|
|
|
|
sysconfdir = @sysconfdir@
|
|
|
|
|
target_alias = @target_alias@
|
|
|
|
|
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
|
|
|
|
|
+m4datadir = $(datadir)/aclocal
|
|
|
|
|
dist_m4data_DATA = \
|
|
|
|
|
$(top_srcdir)/m4/amversion.m4 \
|
|
|
|
|
as.m4 \
|
