summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2000-11-07 01:05:17 +0000
committerjmz <jmz@FreeBSD.org>2000-11-07 01:05:17 +0000
commitee2afe1332fbaf278b62863f015441275c0a58b5 (patch)
tree21bcb03a39486c8c2fdb9d486c6294427eade988
parent16c78d0a2b87cd5fc8686280f4aa3cf5dfd99c3c (diff)
downloadFreeBSD-ports-ee2afe1332fbaf278b62863f015441275c0a58b5.zip
FreeBSD-ports-ee2afe1332fbaf278b62863f015441275c0a58b5.tar.gz
Fix for japanized tk.
Use ${PREFIX} instead of /usr/X11R6 Submitted by: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
-rw-r--r--x11/XFree86-4/scripts/configure7
1 files changed, 5 insertions, 2 deletions
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 7fa504b..2f24ba8 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -28,6 +28,9 @@ F=$WRKDIR/.config
configure () {
rm -f $F
+# set ProjectRoot to be ${PREFIX}
+echo "#define ProjectRoot ${PREFIX}" >>$F
+
# Tk detection
tkversion=
for v in 42 80 81 82 83 42jp 80jp; do
@@ -75,7 +78,7 @@ done
if [ X$tkversion != X ]; then
case $tkversion in
*jp)
- echo "Using Japanized tk-$jptkLversion"
+ echo "Using Japanized tk-$tkLversion"
if [ X"${MACHINE}" = X"pc98" ]; then
echo "#define HasJpTk YES" >>$F
echo "#define JpTkLibDir /usr/local/lib" >>$F
@@ -150,7 +153,7 @@ if [ -e /etc/X11/xinit/xinitrc ]; then
else
XINITDEFAULT=YES
fi
-if [ -e /usr/X11R6/lib/X11/fs/config ]; then
+if [ -e ${PREFIX}/lib/X11/fs/config ]; then
XFSDEFAULT=NO
else
XFSDEFAULT=YES
OpenPOWER on IntegriCloud