From 90b97faaea1b9d15561dfebdec18e13252d13eba Mon Sep 17 00:00:00 2001 From: petef Date: Sat, 8 Dec 2001 14:10:04 +0000 Subject: 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 Approved by: will --- graphics/kdegraphics2/Makefile | 2 +- graphics/kdegraphics3/Makefile | 2 +- graphics/kdegraphics4/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics') diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index 7a180c6..fb598a3e 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -64,7 +64,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@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in ${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 7a180c6..fb598a3e 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -64,7 +64,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@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in ${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 7a180c6..fb598a3e 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -64,7 +64,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@libkscan_la_LIBADD =@libkscan_la_LIBADD= -lintl@g" ${WRKSRC}/libkscan/Makefile.in ${PERL} -pi -e "s@libkcm_kamera_la_LIBADD =@libkcm_kamera_la_LIBADD= -lintl@g" ${WKRSRC}/kamera/kcontrol/Makefile.in -- cgit v1.1