From ef79928b8f765f8c4f1b384c03fa0fa10a396aef Mon Sep 17 00:00:00 2001 From: Pete Fritchman Date: Tue, 18 Dec 2001 07:16:30 +0000 Subject: [PATCH] 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 --- deskutils/kdepim/Makefile | 2 +- deskutils/kdepim3/Makefile | 2 +- deskutils/kdepim4/Makefile | 2 +- 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 \