aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-01-28 12:44:07 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-01-28 12:44:07 +0000
commit699b6562ccd4780aadce7b6e2a6959bf09174606 (patch)
treeb378da238c3b838b553cdee2d380c9b32d9d2461 /x11-toolkits
parentf11a296bac18e301286fdb2810ac48dda612c446 (diff)
downloadports-699b6562ccd4780aadce7b6e2a6959bf09174606.tar.gz
ports-699b6562ccd4780aadce7b6e2a6959bf09174606.zip
PREFIX-safeness fixes.
Notes
Notes: svn path=/head/; revision=99315
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/qt32/Makefile3
-rw-r--r--x11-toolkits/qt33/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 763be2c6c281..7cd2ad25cc0e 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -61,7 +61,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
# The previous Qt port versions installed qmake and qmake's specs under X11BASE
# The new devel/qmake port installs them under LOCALBASE. We can use
# either one here, but we prefer the newer:
-.for d in ${X11BASE} ${LOCALBASE}
+.for d in ${X11BASE} ${LOCALBASE} ${PREFIX}
. if exists($d/share/qt/mkspecs/freebsd-g++)
QTBASE=$d
PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++
@@ -139,6 +139,7 @@ post-build:
# Work around qmake generated dependencies
pre-install:
+ ${MKDIR} ${PREFIX}/lib ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
.for tool in makeqpf mergetr msg2qm qembed qvfb
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 763be2c6c281..7cd2ad25cc0e 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -61,7 +61,7 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
# The previous Qt port versions installed qmake and qmake's specs under X11BASE
# The new devel/qmake port installs them under LOCALBASE. We can use
# either one here, but we prefer the newer:
-.for d in ${X11BASE} ${LOCALBASE}
+.for d in ${X11BASE} ${LOCALBASE} ${PREFIX}
. if exists($d/share/qt/mkspecs/freebsd-g++)
QTBASE=$d
PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++
@@ -139,6 +139,7 @@ post-build:
# Work around qmake generated dependencies
pre-install:
+ ${MKDIR} ${PREFIX}/lib ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
.for tool in makeqpf mergetr msg2qm qembed qvfb