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.
85 lines
2.7 KiB
85 lines
2.7 KiB
Index: Makefile.in |
|
--- Makefile.in.orig 2004-04-18 13:29:47.000000000 +0200 |
|
+++ Makefile.in 2004-04-20 09:13:08.000000000 +0200 |
|
@@ -67,7 +67,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 2004-04-10 19:15:32.000000000 +0200 |
|
+++ aclocal.in 2004-04-20 09:14:27.000000000 +0200 |
|
@@ -29,7 +29,7 @@ |
|
|
|
BEGIN |
|
{ |
|
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; |
|
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@'; |
|
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); |
|
} |
|
|
|
@@ -620,12 +620,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 2004-04-10 19:15:32.000000000 +0200 |
|
+++ automake.in 2004-04-20 09:13:59.000000000 +0200 |
|
@@ -31,7 +31,7 @@ |
|
|
|
BEGIN |
|
{ |
|
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; |
|
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@'; |
|
unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); |
|
|
|
# Override SHELL. This is required on DJGPP so that system() uses |
|
Index: configure |
|
--- configure.orig 2004-04-18 13:29:46.000000000 +0200 |
|
+++ configure 2004-04-20 09:13:08.000000000 +0200 |
|
@@ -1728,7 +1728,7 @@ |
|
|
|
|
|
# A versioned directory, defined here for convenience. |
|
-pkgvdatadir="\${datadir}/$PACKAGE-$APIVERSION" |
|
+pkgvdatadir="\${datadir}/$PACKAGE" |
|
|
|
|
|
# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir', |
|
Index: lib/Automake/Config.in |
|
--- lib/Automake/Config.in.orig 2003-12-25 19:00:29.000000000 +0100 |
|
+++ lib/Automake/Config.in 2004-04-20 09:13:08.000000000 +0200 |
|
@@ -32,7 +32,7 @@ |
|
$APIVERSION = '@APIVERSION@'; |
|
$PACKAGE = '@PACKAGE@'; |
|
$VERSION = '@VERSION@'; |
|
-$libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; |
|
+$libdir = '@datadir@/@PACKAGE@'; |
|
|
|
1;; |
|
|
|
Index: m4/Makefile.in |
|
--- m4/Makefile.in.orig 2004-04-18 13:29:48.000000000 +0200 |
|
+++ m4/Makefile.in 2004-04-20 09:13:08.000000000 +0200 |
|
@@ -120,7 +120,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 \
|
|
|