aboutsummaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorpetef <petef@FreeBSD.org>2001-12-07 23:43:46 +0800
committerpetef <petef@FreeBSD.org>2001-12-07 23:43:46 +0800
commitd75d003553129c7fd9bba07f50e70566f86565a8 (patch)
treef99e7681282bd12c0571708c0b003331e535f1d1 /misc
parenteb027758c13ba5ff81f0ce847f84d0e003869754 (diff)
downloadfreebsd-ports-gnome-d75d003553129c7fd9bba07f50e70566f86565a8.tar.gz
freebsd-ports-gnome-d75d003553129c7fd9bba07f50e70566f86565a8.tar.zst
freebsd-ports-gnome-d75d003553129c7fd9bba07f50e70566f86565a8.zip
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. PR: 32512 Submitted by: Alan Eldridge <alane@geeksrus.net> Approved by: will
Diffstat (limited to 'misc')
-rw-r--r--misc/kdeaddons/Makefile2
-rw-r--r--misc/kdeaddons3/Makefile2
-rw-r--r--misc/kdeutils2/Makefile2
-rw-r--r--misc/kdeutils3/Makefile2
-rw-r--r--misc/kdeutils4/Makefile2
5 files changed, 5 insertions, 5 deletions
diff --git a/misc/kdeaddons/Makefile b/misc/kdeaddons/Makefile
index 18fe7500dff1..526eef1105d0 100644
--- a/misc/kdeaddons/Makefile
+++ b/misc/kdeaddons/Makefile
@@ -45,7 +45,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} -name Makefile.in | xargs ${PERL} -pi -e \
"s@sdl-config@${LOCALBASE}/bin/sdl11-config@g"
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 18fe7500dff1..526eef1105d0 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -45,7 +45,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} -name Makefile.in | xargs ${PERL} -pi -e \
"s@sdl-config@${LOCALBASE}/bin/sdl11-config@g"
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index d1ab1df6523f..508f22d74d90 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -40,7 +40,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
.include <bsd.port.mk>
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index d1ab1df6523f..508f22d74d90 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -40,7 +40,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
.include <bsd.port.mk>
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index d1ab1df6523f..508f22d74d90 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -40,7 +40,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
.include <bsd.port.mk>