diff options
| author | Pete Fritchman <petef@FreeBSD.org> | 2001-12-07 15:43:46 +0000 |
|---|---|---|
| committer | Pete Fritchman <petef@FreeBSD.org> | 2001-12-07 15:43:46 +0000 |
| commit | 61a3a66271d2337b6ebd61e5ffa5c0cdc056e2d9 (patch) | |
| tree | 44134e3916088c91322be1d591de15991d311039 /sysutils | |
| parent | Update port to 4.60 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=51183
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/kdeadmin/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/kdeadmin3/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/kdeadmin4/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/kdf/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/kfloppy/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/sweeper/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile index 98b2edb3d56f..d9b8cde30a43 100644 --- a/sysutils/kdeadmin/Makefile +++ b/sysutils/kdeadmin/Makefile @@ -39,7 +39,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 ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index 98b2edb3d56f..d9b8cde30a43 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -39,7 +39,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 ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index 98b2edb3d56f..d9b8cde30a43 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -39,7 +39,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 ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index d1ab1df6523f..508f22d74d90 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/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/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index d1ab1df6523f..508f22d74d90 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/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/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index d1ab1df6523f..508f22d74d90 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/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> |