diff options
author | petef <petef@FreeBSD.org> | 2001-12-18 15:16:30 +0800 |
---|---|---|
committer | petef <petef@FreeBSD.org> | 2001-12-18 15:16:30 +0800 |
commit | 1862df67e7c7ee1367f952697fc70069aa25fe60 (patch) | |
tree | 7e3bde67142e0110566754008ee5075874f33efa | |
parent | 9d407417bd16ecfb2b7516bf78a068cf1fb825aa (diff) | |
download | freebsd-ports-gnome-1862df67e7c7ee1367f952697fc70069aa25fe60.tar.gz freebsd-ports-gnome-1862df67e7c7ee1367f952697fc70069aa25fe60.tar.zst freebsd-ports-gnome-1862df67e7c7ee1367f952697fc70069aa25fe60.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.
(This is the last one, promise!)
Submitted by: Alan Eldridge <alane@geeksrus.net>
-rw-r--r-- | deskutils/kdepim/Makefile | 2 | ||||
-rw-r--r-- | deskutils/kdepim3/Makefile | 2 | ||||
-rw-r--r-- | deskutils/kdepim4/Makefile | 2 | ||||
-rw-r--r-- | deskutils/kdepim44/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index 787e1269838d..5a6bfe368614 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 787e1269838d..5a6bfe368614 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 787e1269838d..5a6bfe368614 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 787e1269838d..5a6bfe368614 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 \ |