diff -up gcin-1.4.2/gtk-im/Makefile.im-client gcin-1.4.2/gtk-im/Makefile

--- gcin-1.4.2/gtk-im/Makefile.im-client	2007-03-01 12:04:07.000000000 +1000

+++ gcin-1.4.2/gtk-im/Makefile	2008-09-29 11:46:33.000000000 +1000

@@ -24,8 +24,7 @@ endif

 .c.E:

 	$(CC) -E $(CFLAGS) -o $@ $<

-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so

-	export LD_RUN_PATH=$(gcinlibdir) ;\

+im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.2

 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)

 	rm -f core.*

diff -up gcin-1.4.2/im-client/Makefile.im-client gcin-1.4.2/im-client/Makefile

--- gcin-1.4.2/im-client/Makefile.im-client	2007-03-01 12:04:36.000000000 +1000

+++ gcin-1.4.2/im-client/Makefile	2008-09-29 11:46:33.000000000 +1000

@@ -27,9 +27,9 @@ $(SOFILEVER):   $(OBJS)

 LOCALLIB=/usr/local/$(LIB)

 install:

-	install -d $(gcinlibdir)

-	install -m 755 $(SOFILEVER) $(gcinlibdir)

-	cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \

+	install -d $(libdir)

+	install -m 755 $(SOFILEVER) $(libdir)

+	cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \

 	ln -sf $(SOFILEVER) $(SOFILE).1

 	install -d $(includedir)

 	install -m 444 gcin-im-client.h $(includedir)

diff -up gcin-1.4.2/Makefile.im-client gcin-1.4.2/Makefile

--- gcin-1.4.2/Makefile.im-client	2008-05-31 14:19:16.000000000 +1000

+++ gcin-1.4.2/Makefile	2008-09-29 11:46:33.000000000 +1000

@@ -8,7 +8,7 @@ gcin_tsin_o = tsin.o tsin-util.o win0.o 

 gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o

 gcin_gtab_o = gtab.o win-gtab.o gtab-util.o gtab-list.o gtab-buf.o

-GCIN_SO= gcin1.so gcin2.so

+GCIN_SO= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o t2s-lookup.o

 OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \

      gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o \

@@ -18,7 +18,7 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.

              table-update.o locale.o gcin-settings.o gcin-common.o

 OBJS_JUYIN_LEARN=juyin-learn.o locale.o util.o pho-util.o pho-sym.o \

                  gcin-settings.o gcin-conf.o table-update.o pinyin.o

-OBJS_sim2trad=sim2trad.o util.o gcin2.so locale.o gcin-conf.o

+OBJS_sim2trad=sim2trad.o util.o t2s-lookup.o locale.o gcin-conf.o

 OBJS_phod2a=phod2a.o pho-util.o gcin-conf.o pho-sym.o table-update.o pho-dbg.o locale.o \

              gcin-settings.o util.o

 OBJS_tsa2d32=tsa2d32.o gcin-send.o util.o pho-sym.o gcin-conf.o locale.o pho-lookup.o

@@ -95,8 +95,7 @@ endif

 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi

 gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)

-	LD_RUN_PATH=.:$(gcinlibdir) \

-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib

+	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)

 	rm -f core.*

 	ln -sf $@ $@.test

@@ -107,7 +106,6 @@ juyin-learn:        $(OBJS_JUYIN_LEARN)

 	$(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)

 	rm -f core.*

 sim2trad:        $(OBJS_sim2trad)

-	LD_RUN_PATH=.:$(gcinlibdir) \

 	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)

 	rm -f core.*

 trad2sim:	sim2trad

@@ -161,13 +159,13 @@ gcin-message:	$(OBJS_gcin_message)

 pin-juyin:	$(OBJS_pin_juyin)

 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)

-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico

-gcin1.so: $(gcin1_so)

-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)

-

-gcin2_so= t2s-lookup.pico

-gcin2.so: $(gcin2_so)

-	$(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)

+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico

+#gcin1.so: $(gcin1_so)

+#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)

+

+#gcin2_so= t2s-lookup.pico

+#gcin2.so: $(gcin2_so)

+#	$(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)

 ### making the following as .so actuall makes the RSS larger

 gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico

@@ -192,14 +190,11 @@ $(im-srv):

 ibin:

 	install $(PROGS) $(bindir); \

 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim

-	install $(GCIN_SO) $(gcinlibdir)

 install:

 	install -d $(datadir)/icons

 	install gcin.png $(datadir)/icons

 	$(MAKE) -C icons install

-	install -d $(gcinlibdir)

-	install $(GCIN_SO) $(gcinlibdir)

 	install -d $(bindir)

 	$(MAKE) -C data install

 	$(MAKE) -C im-client install

@@ -207,13 +202,9 @@ install:

 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi

 	if [ $(prefix) = /usr/local ]; then \

 	   install -m 644 gcin.png /usr/share/icons; \

-	   install -d $(DOC_DIR); \

-	   install -m 644 README Changelog $(DOC_DIR); \

 	   install $(PROGS) $(bindir); \

 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \

 	else \

-	   install -d $(DOC_DIR_i); \

-	   install -m 644 README Changelog $(DOC_DIR_i); \

 	   install -s $(PROGS) $(bindir); \

 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \

 	fi

@@ -233,7 +224,7 @@ clean:

 	$(MAKE) -C qt-im clean

 	$(MAKE) -C man clean

 	$(MAKE) -C menu clean

-	$(MAKE) -C po clean

+	#$(MAKE) -C po clean

 	rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) $(PROGS_CV) \

 	$(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log

 	find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \;