You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
104 lines
3.2 KiB
104 lines
3.2 KiB
22 years ago
|
Index: m4/Makefile.in
|
||
|
|
--- m4/Makefile.in.orig 2003-10-07 00:24:44.000000000 +0200
|
||
|
|
+++ m4/Makefile.in 2003-11-08 13:38:11.000000000 +0100
|
||
|
|
@@ -94,7 +94,7 @@
|
||
|
|
sysconfdir = @sysconfdir@
|
||
|
|
target_alias = @target_alias@
|
||
|
|
|
||
|
|
-m4datadir = $(datadir)/aclocal-$(APIVERSION)
|
||
|
|
+m4datadir = $(datadir)/aclocal
|
||
|
|
|
||
|
|
dist_m4data_DATA = \
|
||
|
|
as.m4 \
|
||
|
|
@@ -196,7 +196,7 @@
|
||
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||
|
|
|
||
|
|
top_distdir = ..
|
||
|
|
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
||
|
|
+distdir = $(top_distdir)/$(PACKAGE)
|
||
|
|
|
||
|
|
distdir: $(DISTFILES)
|
||
|
|
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||
|
|
Index: lib/Makefile.in
|
||
|
|
--- lib/Makefile.in.orig 2003-10-07 00:24:44.000000000 +0200
|
||
|
|
+++ lib/Makefile.in 2003-11-08 13:38:11.000000000 +0100
|
||
|
|
@@ -294,7 +294,7 @@
|
||
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||
|
|
|
||
|
|
top_distdir = ..
|
||
|
|
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
|
||
|
|
+distdir = $(top_distdir)/$(PACKAGE)
|
||
|
|
|
||
|
|
distdir: $(DISTFILES)
|
||
|
|
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||
|
|
Index: aclocal.in
|
||
|
|
--- aclocal.in.orig 2003-10-07 00:30:46.000000000 +0200
|
||
|
|
+++ aclocal.in 2003-11-08 13:38:43.000000000 +0100
|
||
|
|
@@ -29,7 +29,7 @@
|
||
|
|
|
||
|
|
BEGIN
|
||
|
|
{
|
||
|
|
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||
|
|
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
|
||
|
|
unshift @INC, $perllibdir;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -188,12 +188,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: configure
|
||
|
|
--- configure.orig 2003-10-07 00:24:46.000000000 +0200
|
||
|
|
+++ configure 2003-11-08 13:38:11.000000000 +0100
|
||
|
|
@@ -1623,7 +1623,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: automake.in
|
||
|
|
--- automake.in.orig 2003-10-07 00:11:08.000000000 +0200
|
||
|
|
+++ automake.in 2003-11-08 13:38:11.000000000 +0100
|
||
|
|
@@ -31,7 +31,7 @@
|
||
|
|
|
||
|
|
BEGIN
|
||
|
|
{
|
||
|
|
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@';
|
||
|
|
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
|
||
|
|
unshift @INC, $perllibdir;
|
||
|
|
|
||
|
|
# Override SHELL. This is required on DJGPP so that system() uses
|
||
|
|
@@ -135,7 +135,7 @@
|
||
|
|
# VERSION as string so that eg version 0.30 will print correctly.
|
||
|
|
my $VERSION = '@VERSION@';
|
||
|
|
my $PACKAGE = '@PACKAGE@';
|
||
|
|
-my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
|
||
|
|
+my $libdir = '@datadir@/@PACKAGE@';
|
||
|
|
|
||
|
|
# Some regular expressions. One reason to put them here is that it
|
||
|
|
# makes indentation work better in Emacs.
|
||
|
|
Index: Makefile.in
|
||
|
|
--- Makefile.in.orig 2003-10-07 00:24:44.000000000 +0200
|
||
|
|
+++ Makefile.in 2003-11-08 13:38:11.000000000 +0100
|
||
|
|
@@ -415,7 +415,7 @@
|
||
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||
|
|
|
||
|
|
top_distdir = .
|
||
|
|
-distdir = $(PACKAGE)-$(VERSION)
|
||
|
|
+distdir = $(PACKAGE)
|
||
|
|
|
||
|
|
am__remove_distdir = \
|
||
|
|
{ test ! -d $(distdir) \
|