Make the AUTOMAKE_OVERRIDE work for packages that use automake-1.5 and/or
autoconf-2.5* by touching some more files. Thanks to YAMAMOTO Takashi <yamt@mwd.biglobe.ne.jp> for pointing out the error in private e-mail. Also list several packages on which to verify this code after making changes to the AUTOMAKE*_PATTERNS.
This commit is contained in:
parent
8be7250715
commit
4fe22fcdd8
1 changed files with 12 additions and 7 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.pkg.mk,v 1.885 2001/12/22 05:45:23 jlam Exp $
|
||||
# $NetBSD: bsd.pkg.mk,v 1.886 2001/12/23 19:32:15 jlam Exp $
|
||||
#
|
||||
# This file is in the public domain.
|
||||
#
|
||||
|
@ -1615,26 +1615,31 @@ do-ltconfig-override:
|
|||
# * configure.in might be generated from configure.in.in,
|
||||
# * aclocal.m4 is generated by aclocal from acinclude.m4 and
|
||||
# configure.in,
|
||||
# * stamp-h.in is the automake timestamp file for config.h.in,
|
||||
# * stamp-h.in, stamp-h[0-9].in are the automake timestamp files
|
||||
# for config.h.in,
|
||||
# * config.h.in is generated by autoheader from configure.in
|
||||
# * stamp-h is the automake timestamp file for config.h,
|
||||
# * Makefile.in is generated from Makefile.am,
|
||||
# * the configure script is generated by autoconf from configure.in,
|
||||
# aclocal.m4, and various other *.m4 files.
|
||||
#
|
||||
# After configure script is run:
|
||||
# * config.status is generated by the configure script,
|
||||
# * Makefile and stamp-h are generated by config.status.
|
||||
# * Makefile, stamp-h, stamp-h[0-9] are generated by config.status.
|
||||
# * config.h are generated by config.status.
|
||||
#
|
||||
# NOTE: If you change the patterns listed below, then it's recommended that
|
||||
# you verify that the changes are correct by trying to build the
|
||||
# following packages:
|
||||
#
|
||||
# sysutils/fileutils, www/curl, x11/lesstif, x11/kdelibs2
|
||||
#
|
||||
AUTOMAKE_OVERRIDE?= YES
|
||||
.if defined(AUTOMAKE_OVERRIDE) && (${AUTOMAKE_OVERRIDE} == "YES")
|
||||
AUTOMAKE_PATTERNS+= configure.in
|
||||
AUTOMAKE_PATTERNS+= aclocal.m4
|
||||
AUTOMAKE_PATTERNS+= stamp-h.in config.h.in stamp-h
|
||||
AUTOMAKE_PATTERNS+= stamp-h.in stamp-h[0-9].in config.h.in
|
||||
AUTOMAKE_PATTERNS+= Makefile.in
|
||||
AUTOMAKE_PATTERNS+= ${CONFIGURE_SCRIPT:T}
|
||||
AUTOMAKE_PATTERNS+= stamp-h.in config.h.in stamp-h
|
||||
_AUTOMAKE_PATTERNS_FIND= \
|
||||
\( ${AUTOMAKE_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
|
||||
|
||||
|
@ -1650,7 +1655,7 @@ automake-pre-override:
|
|||
. endif
|
||||
|
||||
AUTOMAKE_POST_PATTERNS+= config.status
|
||||
AUTOMAKE_POST_PATTERNS+= Makefile stamp-h
|
||||
AUTOMAKE_POST_PATTERNS+= Makefile stamp-h stamp-h[0-9]
|
||||
AUTOMAKE_POST_PATTERNS+= config.h
|
||||
_AUTOMAKE_POST_PATTERNS_FIND= \
|
||||
\( ${AUTOMAKE_POST_PATTERNS:S/$/!/:S/^/-o -name !/:S/!/"/g:S/-o//1} \)
|
||||
|
|
Loading…
Reference in a new issue