mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-24 00:45:52 +00:00
Fix missed patch, resulting in aclocal looking for itself in the wrong
place after the upgrade. Submitted by: marcus
This commit is contained in:
parent
d7ebfa900b
commit
1e4e9a3717
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=109145
@ -7,6 +7,7 @@
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.6
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- aclocal.in.orig Thu Jul 25 09:51:42 2002
|
||||
+++ aclocal.in Thu May 13 13:33:24 2004
|
||||
+++ aclocal.in Fri May 14 09:40:13 2004
|
||||
@@ -36,3 +36,4 @@
|
||||
# Note also that the versioned directory is handled later.
|
||||
-$acdir = "@datadir@/aclocal";
|
||||
@ -10,16 +10,25 @@
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
&scan_m4_files (@dirlist);
|
||||
@@ -296,2 +298,3 @@
|
||||
@@ -200,8 +202,2 @@
|
||||
|
||||
- # 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
|
||||
@@ -296,2 +292,3 @@
|
||||
|
||||
+ local (@skipinolist) = ();
|
||||
local ($m4dir);
|
||||
@@ -301,3 +304,3 @@
|
||||
@@ -301,3 +298,3 @@
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
@@ -311,2 +314,8 @@
|
||||
@@ -311,2 +308,8 @@
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
+
|
||||
+ # Do not scan a file more than once.
|
||||
|
Loading…
Reference in New Issue
Block a user