]>
Commit | Line | Data |
---|---|---|
3997bb4d AF |
1 | --- automake-1.7/automake.in.wiget Wed Sep 25 19:54:22 2002 |
2 | +++ automake-1.7/automake.in Thu Sep 26 09:42:12 2002 | |
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@'; | |
9 | unshift @INC, $perllibdir; | |
8f16f38e | 10 | } |
11 | ||
3997bb4d AF |
12 | @@ -126,7 +126,7 @@ |
13 | # VERSION as string so that eg version 0.30 will print correctly. | |
14 | my $VERSION = '@VERSION@'; | |
15 | my $PACKAGE = '@PACKAGE@'; | |
16 | -my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; | |
17 | +my $libdir = '@datadir@/@PACKAGE@'; | |
18 | ||
19 | # Some regular expressions. One reason to put them here is that it | |
20 | # makes indentation work better in Emacs. | |
21 | --- automake-1.7/aclocal.in.wiget Thu Sep 19 22:34:47 2002 | |
22 | +++ automake-1.7/aclocal.in Thu Sep 26 09:43:59 2002 | |
23 | @@ -29,7 +29,7 @@ | |
8f16f38e | 24 | |
8f16f38e | 25 | BEGIN |
26 | { | |
3997bb4d AF |
27 | - my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; |
28 | + my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@'; | |
29 | unshift @INC, $perllibdir; | |
8f16f38e | 30 | } |
31 | ||
3997bb4d | 32 | @@ -185,7 +185,7 @@ |
8ed6f1c2 | 33 | # Search the versioned directory near the end, and then the |
34 | # unversioned directory last. Only do this if the user didn't | |
35 | # override acdir. | |
36 | - push (@dirlist, "$acdir-$APIVERSION") | |
37 | + push (@dirlist, "$acdir") | |
38 | if $acdir eq $default_acdir; | |
39 | ||
40 | # By default $(datadir)/aclocal doesn't exist. We don't want to |