On Sun, Mar 18, 2007 at 08:06:01PM +0100, Matthieu Herrb wrote:
> hi,
>
> the attached patch is enough to have automake generate makefiles that
> works with no executable files in the checked out version of xenocara,
> since on OpenBSD systems, install-sh is only used to create directories.
>
> This matches what automake already does when 'mkinstalldirs' is still
> present.
>
>
> --
> Matthieu Herrb
> Index: Makefile
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/devel/automake/1.9/Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile
> --- Makefile 24 Nov 2006 17:35:32 -0000 1.3
> +++ Makefile 18 Mar 2007 19:05:25 -0000
> @@ -4,7 +4,7 @@
>
> VERSION= 1.9
> DISTNAME= automake-${VERSION}.6
> -PKGNAME= ${DISTNAME}p1
> +PKGNAME= ${DISTNAME}p2
>
> CATEGORIES= devel
> MASTER_SITES= ${MASTER_SITE_GNU:=automake/}
> @@ -42,6 +42,10 @@
>
> TESTS_ENVIRONMENT= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> MAKE=${GMAKE}
> +
> +post-patch:
> + touch ${WRKSRC}/aclocal.m4
> + touch ${WRKSRC}/Makefile.in
>
> do-regress:
> @cd ${WRKBUILD} && \
> Index: patches/patch-automake_in
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/devel/automake/1.9/patches/patch-automake_in,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 patch-automake_in
> --- patches/patch-automake_in 30 Jul 2005 23:35:31 -0000 1.1.1.1
> +++ patches/patch-automake_in 18 Mar 2007 19:05:25 -0000
> @@ -1,6 +1,15 @@
> $OpenBSD: patch-automake_in,v 1.1.1.1 2005/07/30 23:35:31 aanriot Exp $
> --- automake.in.orig Thu Jun 30 23:17:13 2005
> -+++ automake.in Sat Jul 30 23:57:24 2005
> ++++ automake.in Sun Mar 18 17:53:50 2007
> +@@ -3898,7 +3898,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',
> @@ -4649,6 +4649,7 @@ sub scan_autoconf_traces ($)
> _LT_AC_TAGCONFIG => 0,
> m4_include => 1,
> Index: patches/patch-m4_mkdirp_m4
> ===================================================================
> RCS file: patches/patch-m4_mkdirp_m4
> diff -N patches/patch-m4_mkdirp_m4
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-m4_mkdirp_m4 18 Mar 2007 19:05:25 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- m4/mkdirp.m4.orig Sun Mar 18 18:49:45 2007
> ++++ m4/mkdirp.m4 Sun Mar 18 19:56:06 2007
> +@@ -57,7 +57,7 @@
> + if test -f "$ac_aux_dir/mkinstalldirs"; then
> + mkdir_p='$(mkinstalldirs)'
> + else
> +- mkdir_p='$(install_sh) -d'
> ++ mkdir_p='$(SHELL) $(install_sh) -d'
> + fi
> + fi
> + AC_SUBST([mkdir_p])])
Looks good, but the automake change should be fed upstream to the automake
people, along with a proper explanation...
