77 lines
2.1 KiB
Text
77 lines
2.1 KiB
Text
$NetBSD: patch-aa,v 1.2 2006/04/28 18:24:53 joerg Exp $
|
|
|
|
--- configure.orig 2006-01-04 19:37:46.000000000 +0800
|
|
+++ configure
|
|
@@ -9,13 +9,13 @@ if [ "$1" = "-h" -o "$1" = "--help" -o "
|
|
fi
|
|
|
|
MAKE=make
|
|
-which gmake >& /dev/null
|
|
+which gmake > /dev/null
|
|
if [ $? = 0 ]; then
|
|
MAKE=gmake
|
|
fi
|
|
|
|
-uname | grep FreeBSD >& /dev/null
|
|
-if [ $? = 0 ]; then
|
|
+OS=`uname -s`
|
|
+if [ $OS = "FreeBSD" ] || [ $OS = "NetBSD" ]|| [ $OS = "DragonFly" ]; then
|
|
FREEBSD=1
|
|
else
|
|
FREEBSD=0
|
|
@@ -23,6 +23,7 @@ fi
|
|
|
|
|
|
prefix="/usr/local"
|
|
+x11base="/usr/X11R6"
|
|
use_xim='Y'
|
|
new_gtk_im='N'
|
|
|
|
@@ -34,6 +35,8 @@ for opt do
|
|
case "$opt" in
|
|
--prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
|
|
;;
|
|
+ --x11base=*) x11base=`echo $opt | cut -d '=' -f 2`
|
|
+ ;;
|
|
--use_xim=*) use_xim=`echo $opt | cut -d '=' -f 2`
|
|
;;
|
|
--new_gtk_im=*) new_gtk_im=`echo $opt | cut -d '=' -f 2`
|
|
@@ -88,7 +91,7 @@ fi
|
|
|
|
bindir=$prefix/bin
|
|
datadir=$prefix/share
|
|
-mandir=$datadir/man
|
|
+mandir=$prefix/man
|
|
libdir=$prefix/lib
|
|
includedir=$prefix/include
|
|
optdir=/opt
|
|
@@ -111,7 +114,7 @@ if [ $QT_IM = 'N' ]; then
|
|
grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec
|
|
fi
|
|
|
|
-grep Cooker /etc/mandriva-release 2>&1 | grep 2006 >& /dev/null
|
|
+grep Cooker /etc/mandriva-release 2>&1 | grep 2006 > /dev/null
|
|
if [ $? = 0 ]; then
|
|
new_gtk_im='Y'
|
|
echo "!!!! new gtk-im(im-gcin.so) will be enabled because you are using Cooker 2006."
|
|
@@ -138,7 +141,7 @@ echo "datadir_r=$datadir" >> config.mak
|
|
echo "libdir=\$(DESTDIR)$libdir" >> config.mak
|
|
echo "includedir=\$(DESTDIR)$includedir" >> config.mak
|
|
|
|
-echo "LDFLAGS=$GTKLDFLAGS" >> config.mak
|
|
+echo "LDFLAGS=$GTKLDFLAGS -L$x11base/lib -Wl,-R$x11base/lib" >> config.mak
|
|
echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak
|
|
echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak
|
|
echo "GCIN_TABLE_DIR_i=\$(datadir)/gcin/table" >> config.mak
|
|
@@ -164,10 +167,5 @@ cd menu
|
|
for i in *.in
|
|
do
|
|
outf=`echo $i | sed -e "s/\.in//"`
|
|
-# echo $outf
|
|
- if [ $bindir = /usr/bin ]; then
|
|
- sed -e "s~/usr/local/bin~/usr/bin~" < $i > $outf
|
|
- else
|
|
- cp $i $outf
|
|
- fi
|
|
+ sed -e "s~/usr/local/bin~$prefix/bin~" < $i > $outf
|
|
done
|