Fix a problem with auto{conf,make}: some build magic was introduced to
make sure that the "autoconf" and "automake" binaries KDE looked for were found and were autoconf213 and automake14 (as there are issues with the latest versions), but the logic in setting $PATH was wrong. This puts ${WRKSRC}/auto-bin before the rest of the users $PATH. This fixes KDE auto* problems if automake14 and automake-1.5 are both installed. (This is the last one, promise!) Submitted by: Alan Eldridge <alane@geeksrus.net>
This commit is contained in:
parent
4138db0e8b
commit
ef79928b8f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51726
4 changed files with 4 additions and 4 deletions
|
@ -47,7 +47,7 @@ pre-configure:
|
|||
.for AM in automake aclocal
|
||||
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
|
||||
.endfor
|
||||
cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
|
||||
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
|
||||
${GMAKE} -f Makefile.cvs
|
||||
find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \
|
||||
xargs ${PERL} -pi -e \
|
||||
|
|
|
@ -47,7 +47,7 @@ pre-configure:
|
|||
.for AM in automake aclocal
|
||||
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
|
||||
.endfor
|
||||
cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
|
||||
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
|
||||
${GMAKE} -f Makefile.cvs
|
||||
find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \
|
||||
xargs ${PERL} -pi -e \
|
||||
|
|
|
@ -47,7 +47,7 @@ pre-configure:
|
|||
.for AM in automake aclocal
|
||||
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
|
||||
.endfor
|
||||
cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
|
||||
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
|
||||
${GMAKE} -f Makefile.cvs
|
||||
find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \
|
||||
xargs ${PERL} -pi -e \
|
||||
|
|
|
@ -47,7 +47,7 @@ pre-configure:
|
|||
.for AM in automake aclocal
|
||||
${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
|
||||
.endfor
|
||||
cd ${WRKSRC} && env PATH=$$PATH:${WRKSRC}/auto-bin \
|
||||
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
|
||||
${GMAKE} -f Makefile.cvs
|
||||
find ${WRKSRC}/kpilot \( -name Makefile.in -o -name Makefile.am \) | \
|
||||
xargs ${PERL} -pi -e \
|
||||
|
|
Loading…
Reference in a new issue