]>
Commit | Line | Data |
---|---|---|
1e718d93 JB |
1 | --- automake-1.8/automake.in.orig 2003-12-08 18:53:57.000000000 +0100 |
2 | +++ automake-1.8/automake.in 2003-12-12 23:59:37.118849200 +0100 | |
3997bb4d AF |
3 | @@ -31,7 +31,7 @@ |
4 | ||
8f16f38e | 5 | BEGIN |
6 | { | |
3997bb4d AF |
7 | - my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; |
8 | + my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@'; | |
1e718d93 | 9 | unshift @INC, (split ':', $perllibdir); |
3997bb4d | 10 | |
1e718d93 JB |
11 | # Override SHELL. This is required on DJGPP so that system() uses |
12 | --- automake-1.8/aclocal.in.orig 2003-12-05 22:19:39.000000000 +0100 | |
13 | +++ automake-1.8/aclocal.in 2003-12-13 00:01:06.689232432 +0100 | |
3997bb4d | 14 | @@ -29,7 +29,7 @@ |
8f16f38e | 15 | |
8f16f38e | 16 | BEGIN |
17 | { | |
3997bb4d AF |
18 | - my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; |
19 | + my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@'; | |
1e718d93 | 20 | unshift @INC, (split ':', $perllibdir); |
8f16f38e | 21 | } |
22 | ||
1e718d93 JB |
23 | @@ -522,7 +522,7 @@ |
24 | # Search the versioned directory near the end, and then the | |
25 | # unversioned directory last. Only do this if the user didn't | |
26 | # override acdir. | |
27 | - push (@dirlist, "$acdir-$APIVERSION") | |
28 | + push (@dirlist, "$acdir") | |
29 | if $acdir eq $default_acdir; | |
30 | ||
31 | # By default $(datadir)/aclocal doesn't exist. We don't want to | |
32 | --- automake-1.8/lib/Automake/Config.in.orig 2003-12-09 19:20:56.000000000 +0100 | |
33 | +++ automake-1.8/lib/Automake/Config.in 2003-12-13 00:38:45.796795880 +0100 | |
34 | @@ -31,7 +31,7 @@ | |
35 | $APIVERSION = '@APIVERSION@'; | |
36 | $PACKAGE = '@PACKAGE@'; | |
37 | $VERSION = '@VERSION@'; | |
38 | -$libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; | |
39 | +$libdir = '@datadir@/@PACKAGE@'; | |
40 | ||
41 | 1;; | |
8ed6f1c2 | 42 |