summaryrefslogtreecommitdiffstats
path: root/deskutils
diff options
context:
space:
mode:
authorpetef <petef@FreeBSD.org>2001-12-18 07:16:30 +0000
committerpetef <petef@FreeBSD.org>2001-12-18 07:16:30 +0000
commit1862df67e7c7ee1367f952697fc70069aa25fe60 (patch)
tree7e3bde67142e0110566754008ee5075874f33efa /deskutils
parent9d407417bd16ecfb2b7516bf78a068cf1fb825aa (diff)
downloadFreeBSD-ports-1862df67e7c7ee1367f952697fc70069aa25fe60.zip
FreeBSD-ports-1862df67e7c7ee1367f952697fc70069aa25fe60.tar.gz
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>
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kdepim/Makefile2
-rw-r--r--deskutils/kdepim3/Makefile2
-rw-r--r--deskutils/kdepim4/Makefile2
-rw-r--r--deskutils/kdepim44/Makefile2
4 files changed, 4 insertions, 4 deletions
diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile
index 787e126..5a6bfe3 100644
--- a/deskutils/kdepim/Makefile
+++ b/deskutils/kdepim/Makefile
@@ -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 \
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 787e126..5a6bfe3 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -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 \
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 787e126..5a6bfe3 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -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 \
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 787e126..5a6bfe3 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -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 \
OpenPOWER on IntegriCloud