Blob Blame History Raw
diff -urN gcin-1.4.4.orig/configure gcin-1.4.4/configure
--- gcin-1.4.4.orig/configure	2008-11-28 20:26:55.000000000 +0800
+++ gcin-1.4.4/configure	2009-02-04 10:25:27.000000000 +0800
@@ -112,7 +112,7 @@
 fi
 
 QT_IM='N'
-QT_IM_DIR=/usr/lib/qt3/plugins/lib/inputmethods
+QT_IM_DIR=/usr/$LIB/qt-3.3/plugins/inputmethods
 echo "testing if you have qt3 support"
 if [ -d  $QT_IM_DIR ]; then
   QT_IM='Y'
@@ -126,7 +126,7 @@
 
 
 QT4_IM='N'
-QT4_IM_DIR=/usr/lib/qt4/plugins/lib/inputmethods
+QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods
 echo "testing if you have qt4 support"
 if [ -d  $QT4_IM_DIR ]; then
   QT4_IM='Y'
diff -urN gcin-1.4.4.orig/qt-im/Makefile gcin-1.4.4/qt-im/Makefile
--- gcin-1.4.4.orig/qt-im/Makefile	2009-01-27 19:43:08.000000000 +0800
+++ gcin-1.4.4/qt-im/Makefile	2009-02-04 10:38:19.000000000 +0800
@@ -1,17 +1,13 @@
 include ../config.mak
-QT=qt3
+QT=qt-3.3
 QTIM=$(QT)/plugins/inputmethods
 IMMODULES=$(libdir)/$(QTIM)
-ifeq ($(LIB), lib64)
-	IMMODULES_LOCAL=/usr/$(LIB)/$(QT)/plugins/lib64/inputmethods
-else
-	IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
-endif
-INCS=-I../im-client -I/usr/lib/$(QT)/include  -I/usr/include/Xft2/X11/Xft  -I/usr/include/fontconfig -I/usr/include/freetype2
+IMMODULES_LOCAL=/usr/$(LIB)/$(QTIM)
+INCS=-I../im-client -I/usr/$(LIB)/$(QT)/include  -I/usr/include/Xft2/X11/Xft  -I/usr/include/fontconfig -I/usr/include/freetype2
 CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -fPIC  -DQT_THREAD_SUPPORT -DQT_PLUGIN -DQT_SHARED -DQT_NO_DEBUG
 OBJS=qgcininputcontextplugin.o qgcininputcontextplugin_my.o qgcininputcontext.o qgcininputcontext_x11.o
 .SUFFIXES:	.c .cpp .a .so .E .h
-LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lqt-mt -lmng -ljpeg -lpng -lz \
+LDFLAGS=-L/usr/$(LIB)/$(QT)/lib -L/usr/X11R6/$(LIB) -L../im-client -lqt-mt -lmng -ljpeg -lpng -lz \
 -lXrender -lXrandr  -lXft -lfontconfig -lgcin-im-client \
 -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
 all:	libqgcin.so
@@ -19,7 +15,7 @@
 .cpp.E:
 	$(CXX) -E $(CFLAGS) $(INCS) $< > $@
 .h.o:
-	/usr/lib/$(QT)/bin/moc $< -o $<_moc.cpp
+	/usr/$(LIB)/$(QT)/bin/moc $< -o $<_moc.cpp
 	$(CXX) -c -pipe $(CXXFLAGS) $(INCS) $<_moc.cpp -o $@
 
 libqgcin.so: $(OBJS)