Persuade automake to look not only in ${PREFIX}/share/aclocal

(ie: ${LOCALBASE}), but also ${X11BASE}/share/aclocal via an extra
patch and some configure-time substitution

Discussed on:			ports (quite a while back)
Original disgusting hack by:	ade
Suggested improvements by:	asami
Reworked patch by:		ade
This commit is contained in:
Ade Lovett 2000-07-15 19:07:48 +00:00
parent 1788a167d6
commit bb104d8a03
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30673
18 changed files with 126 additions and 0 deletions

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{

View File

@ -19,6 +19,9 @@ USE_PERL5= yes
STRIP= # none
pre-configure:
${PERL} -pi -e "s^%%X11BASE%%^${X11BASE}^" ${WRKSRC}/aclocal.in
post-install:
@install-info ${PREFIX}/info/automake.info ${PREFIX}/info/dir

View File

@ -0,0 +1,11 @@
--- aclocal.in.orig Sun Jan 10 20:35:27 1999
+++ aclocal.in Sat Jul 15 13:59:55 2000
@@ -103,7 +103,7 @@
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files ($acdir, '%%X11BASE%%/share/aclocal', @dirlist);
&scan_configure;
if (! $exit_status)
{