Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 3216c59433be00f953c3726febe045e3 > files > 1

gcin-1.4.3-0.pre6.1mdv2009.0.src.rpm

--- gcin-1.4.3.pre5/configure.orig	2008-08-03 11:51:13.000000000 +0200
+++ gcin-1.4.3.pre5/configure	2008-08-21 21:12:13.000000000 +0200
@@ -112,7 +112,7 @@
 fi
 
 QT_IM='N'
-QT_IM_DIR=/usr/lib/qt3/plugins/lib/inputmethods
+QT_IM_DIR=/usr/$LIB/qt3/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  $QT_IM_DIR ]; then
   QT4_IM='Y'
--- gcin-1.4.3.pre5/qt-im/Makefile.orig	2008-08-05 14:43:56.000000000 +0200
+++ gcin-1.4.3.pre5/qt-im/Makefile	2008-08-21 21:12:58.000000000 +0200
@@ -2,16 +2,12 @@
 QT=qt3
 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
+IMMODULES_LOCAL=$(IMMODULES)
 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) -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
--- gcin-1.4.3.pre5/qt4-im/Makefile~	2008-08-04 17:55:57.000000000 +0200
+++ gcin-1.4.3.pre5/qt4-im/Makefile	2008-08-21 21:14:27.000000000 +0200
@@ -1,12 +1,7 @@
 include ../config.mak
 QT=qt4
-QTIM=$(QT)/plugins/lib/inputmethods
+QTIM=$(QT)/plugins/inputmethods
 IMMODULES=$(libdir)/$(QTIM)
-ifeq ($(LIB), lib64)
-	IMMODULES_LOCAL=/usr/lib/qt4/plugins/lib64/inputmethods
-else
-	IMMODULES_LOCAL=/usr/lib/$(QTIM)
-endif
 QTINC=/usr/lib/$(QT)/include
 
 INCS=-I../im-client -I$(QTINC) -I/usr/include/X11 -I$(QTINC)/QtGui -I$(QTINC)/QtCore
@@ -14,7 +9,7 @@
 -DQT_IMMODULE -DPIC
 OBJS= moc_gcin-qt.o gcin-qt.o im-gcin-qt.o gcin-imcontext-qt.o
 .SUFFIXES:	.c .cpp .a .so .E .h
-LDFLAGS=-L/usr/lib/$(QT)/$(LIB) -L/usr/X11R6/$(LIB) -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
+LDFLAGS= -L/usr/X11R6/$(LIB) -L../im-client -lQtGui -lQtCore -lmng -ljpeg -lpng -lz \
 -lXrender -lXrandr  -lXft -lfontconfig -lgcin-im-client \
 -lXext -lX11 -lm -lSM -lICE -ldl -lpthread
 all:    im-gcin.so