openbsd-ports/devel/automake/1.11/patches/patch-automake_in
2011-05-05 18:55:34 +00:00

29 lines
1.1 KiB
Plaintext

$OpenBSD: patch-automake_in,v 1.1.1.1 2011/05/05 18:55:34 jasper Exp $
--- automake.in.orig Tue Dec 8 19:15:40 2009
+++ automake.in Thu May 5 19:57:31 2011
@@ -4337,7 +4337,7 @@ sub handle_configure ($$$@)
# Use $(install_sh), not $(MKDIR_P) because the latter requires
# at least one argument, and $(mkinstalldirs) used to work
# even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)).
- define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL);
+ define_variable ('mkinstalldirs', '$(SHELL) $(install_sh) -d', INTERNAL);
}
reject_var ('CONFIG_HEADER',
@@ -5240,6 +5240,7 @@ sub scan_autoconf_traces ($)
_LT_AC_TAGCONFIG => 0,
m4_include => 1,
m4_sinclude => 1,
+ include => 1,
sinclude => 1,
);
@@ -5263,6 +5264,7 @@ sub scan_autoconf_traces ($)
my ($here, $depth, @args) = split (/::/);
$where = new Automake::Location $here;
my $macro = $args[0];
+ next if ($macro eq "include");
prog_error ("unrequested trace `$macro'")
unless exists $traced{$macro};