--- koffice-1.1/filters/kontour/svg/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/filters/kontour/svg/Makefile.am	Fri Aug 17 09:03:44 2001
@@ -7,11 +7,11 @@
 kde_module_LTLIBRARIES = libsvgimport.la libsvgexport.la
 
 libsvgimport_la_SOURCES = svgimport.cc svgimport_factory.cc basicshapes.h basicshapes.cc datatypes.h datatypes.cc path.h path.cc transform.h transform.cc style.h style.cc text.h text.cc svgmain.h svgmain.cc
-libsvgimport_la_LDFLAGS	= -module -avoid-version -no-undefined
+libsvgimport_la_LDFLAGS	= $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libsvgimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kontour/libkontourpart.la
 
 libsvgexport_la_SOURCES = svgexport.cc svgexport_factory.cc
-libsvgexport_la_LDFLAGS	= -module -avoid-version -no-undefined
+libsvgexport_la_LDFLAGS	= $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libsvgexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kontour/libkontourpart.la
 
 METASOURCES = AUTO
--- koffice-1.1/filters/kontour/xfig/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/filters/kontour/xfig/Makefile.am	Fri Aug 17 09:04:02 2001
@@ -1,7 +1,7 @@
 ####### General stuff
 
 INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(top_srcdir)/kontour $(all_includes)
-libxfigimport_la_LDFLAGS	= -module -avoid-version -no-undefined
+libxfigimport_la_LDFLAGS	= $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libxfigimport_la_LIBADD = $(KOFFICE_LIBS) ../../../kontour/libkontourpart.la
 
 ####### Files
--- koffice-1.1/filters/kspread/csv/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/filters/kspread/csv/Makefile.am	Fri Aug 17 09:01:42 2001
@@ -9,11 +9,11 @@
 
 libcsvimport_la_SOURCES = csvimport.cc xmltree.cc csvimport_factory.cc \
                           csvdialog.cpp dialogui.ui 
-libcsvimport_la_LDFLAGS	= -module -avoid-version -no-undefined
+libcsvimport_la_LDFLAGS	= $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libcsvimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
 
 libcsvexport_la_SOURCES = csvexport.cc csvexport_factory.cc
-libcsvexport_la_LDFLAGS = -module -avoid-version -no-undefined
+libcsvexport_la_LDFLAGS = $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libcsvexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
 
 METASOURCES = AUTO
--- koffice-1.1/filters/kspread/gnumeric/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/filters/kspread/gnumeric/Makefile.am	Fri Aug 17 09:02:30 2001
@@ -7,11 +7,11 @@
 kde_module_LTLIBRARIES = libgnumericexport.la libgnumericimport.la 
 
 libgnumericexport_la_SOURCES = gnumericexport.cc gnumericexport_factory.cc
-libgnumericexport_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnumericexport_la_LDFLAGS = $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libgnumericexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
 
 libgnumericimport_la_SOURCES = gnumericimport.cc gnumericimport_factory.cc
-libgnumericimport_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnumericimport_la_LDFLAGS = $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libgnumericimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
 
 METASOURCES = AUTO
--- koffice-1.1/filters/kspread/html/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/filters/kspread/html/Makefile.am	Fri Aug 17 09:02:57 2001
@@ -8,7 +8,7 @@
 kde_module_LTLIBRARIES = libkspreadhtmlexport.la
 
 libkspreadhtmlexport_la_SOURCES = htmlexport.cc htmlexport_factory.cc
-libkspreadhtmlexport_la_LDFLAGS = -module -avoid-version -no-undefined
+libkspreadhtmlexport_la_LDFLAGS = $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libkspreadhtmlexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la
 
 METASOURCES = AUTO
--- koffice-1.1/filters/kspread/qpro/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/filters/kspread/qpro/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -11,7 +11,7 @@
 
 libqproimport_la_SOURCES = qproimport.cc qproimport_factory.cc qproformula.cc
 
-libqproimport_la_LDFLAGS = -module -avoid-version -no-undefined
+libqproimport_la_LDFLAGS = $(KDE_RPATH) -R$(kde_moduledir) -module -avoid-version -no-undefined
 libqproimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadpart.la \
 	libqpro/src/libqpro.la
 
--- koffice-1.1/kivio/kiviopart/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kivio/kiviopart/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -131,7 +131,7 @@
 kivio_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kivio_la_LIBADD = ../../lib/kofficecore/libkofficecore.la
 
-libkiviopart_la_LDFLAGS = -avoid-version -module $(LIB_KOFFICEUI) $(all_libraries)
+libkiviopart_la_LDFLAGS = $(KDE_RPATH) -avoid-version -module $(LIB_KOFFICEUI) $(all_libraries)
 
 bin_PROGRAMS = kivio
 kivio_SOURCES = dummy.cpp
--- koffice-1.1/kivio/plugins/kivioselecttool/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kivio/plugins/kivioselecttool/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -6,7 +6,7 @@
 lib_LTLIBRARIES =libkivioselecttool.la
 
 
-libkivioselecttool_la_LDFLAGS = -version-info 
+libkivioselecttool_la_LDFLAGS = -R$(kde_moduledir) -version-info 
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
 	-I$(top_srcdir)/kivio/kiviopart/kiviosdk\
@@ -27,7 +27,7 @@
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkivioselecttool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkivioselecttool_la_LDFLAGS = -R$(kde_moduledir) -avoid-version -module -no-undefined
 libkivioselecttool_la_LIBADD = $(all_libraries) $(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kivioselecttool.rc
--- koffice-1.1/kivio/plugins/kivioconnectortool/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kivio/plugins/kivioconnectortool/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -6,7 +6,7 @@
 lib_LTLIBRARIES =libkivioconnectortool.la
 
 
-libkivioconnectortool_la_LDFLAGS = -version-info
+libkivioconnectortool_la_LDFLAGS = -R$(kde_moduledir) -version-info
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
 	-I$(top_srcdir)/kivio/kiviopart/kiviosdk\
@@ -31,7 +31,7 @@
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkivioconnectortool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkivioconnectortool_la_LDFLAGS = -R$(kde_moduledir) -avoid-version -module -no-undefined
 libkivioconnectortool_la_LIBADD = $(all_libraries) $(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kivioconnectortool.rc
--- koffice-1.1/kivio/plugins/kiviotexttool/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kivio/plugins/kiviotexttool/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -6,7 +6,7 @@
 lib_LTLIBRARIES =libkiviotexttool.la
 
 
-libkiviotexttool_la_LDFLAGS = -version-info 
+libkiviotexttool_la_LDFLAGS = -R$(kde_moduledir) -version-info 
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
 	-I$(top_srcdir)/kivio/kiviopart/kiviosdk\
@@ -31,7 +31,7 @@
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkiviotexttool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkiviotexttool_la_LDFLAGS = -R$(kde_moduledir) -avoid-version -module -no-undefined
 libkiviotexttool_la_LIBADD = $(all_libraries) $(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kiviotexttool.rc
--- koffice-1.1/kivio/plugins/kiviozoomtool/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kivio/plugins/kiviozoomtool/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -6,7 +6,7 @@
 lib_LTLIBRARIES =libkiviozoomtool.la
 
 
-libkiviozoomtool_la_LDFLAGS = -version-info
+libkiviozoomtool_la_LDFLAGS = -R$(kde_moduledir) -version-info
 
 INCLUDES = -I$(top_srcdir)/kivio/kiviopart\
 	-I$(top_srcdir)/kivio/kiviopart/kiviosdk\
@@ -27,7 +27,7 @@
 ##############################################################
 ####                  END KDEStudio part                  ####
 #2########################################################!@#$
-libkiviozoomtool_la_LDFLAGS = -avoid-version -module -no-undefined
+libkiviozoomtool_la_LDFLAGS = -R$(kde_moduledir) -avoid-version -module -no-undefined
 libkiviozoomtool_la_LIBADD = $(all_libraries) $(top_builddir)/kivio/kiviopart/libkiviopart.la
 
 rc_DATA = kiviozoomtool.rc
--- koffice-1.1/kspread/plugins/calculator/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kspread/plugins/calculator/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -10,7 +10,7 @@
 			kcalc_core.cpp \
 			main.cpp \
 			stats.cpp
-libkspreadcalc_la_LDFLAGS = -avoid-version -module -no-undefined
+libkspreadcalc_la_LDFLAGS = -R$(kde_moduledir) -avoid-version -module -no-undefined
 libkspreadcalc_la_LIBADD = $(all_libraries) ../../libkspreadpart.la
 
 METASOURCES = AUTO
--- koffice-1.1/kword/Makefile.am.orig	Fri Aug 17 09:05:48 2001
+++ koffice-1.1/kword/Makefile.am	Thu Aug 16 17:06:23 2001
@@ -1,3 +1,4 @@
+KDE_OPTIONS = nofinal
 
 KDE_CXXFLAGS = $(USE_RTTI)
 INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/lib/kformula \