source: scripts/untested/autotools/patches/automake-1.5-slot.patch@ f118837

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since f118837 was d1afb9e, checked in by Jim Gifford <clfs@…>, 19 years ago

r587@server (orig r585): ryan | 2005-08-05 21:51:35 -0700
Add a sane autotools build to the mix.
Blatantly stolen from gentoo...



  • Property mode set to 100644
File size: 1.2 KB
RevLine 
[d1afb9e]1--- automake-1.5/aclocal.in.orig 2004-10-22 11:11:05.361192040 -0400
2+++ automake-1.5/aclocal.in 2004-10-22 11:11:45.362110976 -0400
3@@ -33,5 +33,5 @@
4 $prefix = "@prefix@";
5 # Note that this isn't pkgdatadir, but a separate directory.
6-$acdir = "@datadir@/aclocal";
7+$acdir = "@datadir@/aclocal-1.5";
8
9 # Some globals.
10@@ -116,4 +116,5 @@
11
12 local (@dirlist) = &parse_arguments (@ARGV);
13+push (@dirlist, "/usr/share/aclocal") if (!grep(/^--acdir/, @ARGV));
14 &scan_m4_files (@dirlist);
15 &scan_configure;
16@@ -203,5 +204,5 @@
17 if ($print_and_exit)
18 {
19- print $acdir, "\n";
20+ print "/usr/share/aclocal", "\n";
21 exit 0;
22 }
23--- automake-1.5/automake.in.orig 2004-10-22 11:14:10.787003032 -0400
24+++ automake-1.5/automake.in 2004-10-22 11:14:22.072287408 -0400
25@@ -32,7 +32,7 @@
26 BEGIN
27 {
28 my $prefix = "@prefix@";
29- my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@";
30+ my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-1.5";
31 unshift @INC, "$perllibdir";
32 }
33
34@@ -127,7 +127,7 @@
35 my $VERSION = "@VERSION@";
36 my $PACKAGE = "@PACKAGE@";
37 my $prefix = "@prefix@";
38-my $libdir = "@datadir@/@PACKAGE@";
39+my $libdir = "@datadir@/@PACKAGE@-1.5";
40
41 # String constants.
42 my $IGNORE_PATTERN = '^\s*##([^#\n].*)?\n';
Note: See TracBrowser for help on using the repository browser.