* quite a lot of patches in the building stuff

diff --git a/helm/gtkmathview-bonobo/Makefile.am b/helm/gtkmathview-bonobo/Makefile.am
index 8f5e45f8d0fcefca2200e5a9ab3da46b3401822c..8524127c112a3c3c2900a7be3fda1d6fcc7fbc89 100644 (file)
--- a/helm/gtkmathview-bonobo/Makefile.am
+++ b/helm/gtkmathview-bonobo/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = BUGS HISTORY LICENSE ANNOUNCEMENT CONTRIBUTORS config.h.in
+EXTRA_DIST = config.h.in
 SUBDIRS = src test
 CLEANFILES = core *.log *.eps
 

diff --git a/helm/gtkmathview-bonobo/configure.ac b/helm/gtkmathview-bonobo/configure.ac
index 7eee2686cb432a53fca8163bc882f5229134fd69..06f35c6d08168355af67a2bf4b9bd988a53cdde3 100644 (file)
--- a/helm/gtkmathview-bonobo/configure.ac
+++ b/helm/gtkmathview-bonobo/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(gtkmathview-bonobo, [0.0.1])
-AC_CONFIG_SRCDIR(src/GNOME_GtkMathView.server.in)
+AC_CONFIG_SRCDIR(src/GNOME_GtkMathView.server.in.in)
 AM_INIT_AUTOMAKE($AC_PACKAGE_NAME, $AC_PACKAGE_VERSION)
 
 PACKAGE=$PACKAGE_NAME
@@ -101,7 +101,7 @@ AC_CONFIG_FILES([
  Makefile 
  gtkmathview-bonobo.pc
  src/Makefile
- src/GNOME_GtkMathView.server
+ src/GNOME_GtkMathView.server.in
  test/Makefile
 ])
 AC_OUTPUT

diff --git a/helm/gtkmathview-bonobo/src/.cvsignore b/helm/gtkmathview-bonobo/src/.cvsignore
index d4c91def35f9f16b0eccc81771cfe3cfedfe9220..f7ad5df6dc7cd3f6afef12a2fc4eb33f7b4a6aa9 100644 (file)
--- a/helm/gtkmathview-bonobo/src/.cvsignore
+++ b/helm/gtkmathview-bonobo/src/.cvsignore
@@ -1,7 +1,9 @@
 .deps
 .libs
 GNOME_GtkMathView.server
+GNOME_GtkMathView.server.in
 Makefile
 Makefile.in
 libgtkmathview-bonobo.la
 control-factory.lo
+persist-file.lo

diff --git a/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in b/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in
deleted file mode 100644 (file)
index 75ba9d9..0000000
--- a/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in
+++ /dev/null
@@ -1,32 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_GtkMathView_Factory:@GTKMATHVIEW_API_VERSION@" type="shlib"
-               location="./src/.libs/libgtkmathview-bonobo.so">
-
-               <oaf_attribute name="repo_ids" type="stringv">
-                       <item value="IDL:GNOME/GenericFactory:1.0"/>
-               </oaf_attribute>
-
-               <oaf_attribute name="name" type="string" value="Gtk MathML Viewer Factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_GtkMathView:@GTKMATHVIEW_API_VERSION@" type="factory" location="OAFIID:GNOME_GtkMathView_Factory:@GTKMATHVIEW_API_VERSION@">
-
-               <oaf_attribute name="repo_ids" type="stringv">
-                       <item value="IDL:Bonobo/Control:1.0"/>
-                       <item value="IDL:Bonobo/Unkown:1.0"/>
-                       <item value="IDL:Bonobo/PersistStream:1.0"/>
-                       <item value="IDL:Bonobo/PersistFile:1.0"/>
-                       <item value="IDL:Bonobo/Persist:1.0"/>
-               </oaf_attribute>
-
-               <oaf_attribute name="name" type="string" value="GtkMathView"/>
-
-               <oaf_attribute name="description" type="string" value="GtkMathView"/>
-               <oaf_attribute name="bonobo:editable" type="boolean" value="false"/>
-               <oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-                       <item value="text/xml"/>
-               </oaf_attribute>
-</oaf_server>
-
-</oaf_info>    

diff --git a/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in.in b/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in.in
new file mode 100644 (file)
index 0000000..17ba5ee
--- /dev/null
+++ b/helm/gtkmathview-bonobo/src/GNOME_GtkMathView.server.in.in
@@ -0,0 +1,32 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_GtkMathView_Factory:@GTKMATHVIEW_API_VERSION@" type="shlib"
+               location="@GTKMATHVIEW_FACTORY_LOCATION@">
+
+               <oaf_attribute name="repo_ids" type="stringv">
+                       <item value="IDL:GNOME/GenericFactory:1.0"/>
+               </oaf_attribute>
+
+               <oaf_attribute name="name" type="string" value="Gtk MathML Viewer Factory"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_GtkMathView:@GTKMATHVIEW_API_VERSION@" type="factory" location="OAFIID:GNOME_GtkMathView_Factory:@GTKMATHVIEW_API_VERSION@">
+
+               <oaf_attribute name="repo_ids" type="stringv">
+                       <item value="IDL:Bonobo/Control:1.0"/>
+                       <item value="IDL:Bonobo/Unkown:1.0"/>
+                       <item value="IDL:Bonobo/PersistStream:1.0"/>
+                       <item value="IDL:Bonobo/PersistFile:1.0"/>
+                       <item value="IDL:Bonobo/Persist:1.0"/>
+               </oaf_attribute>
+
+               <oaf_attribute name="name" type="string" value="GtkMathView"/>
+
+               <oaf_attribute name="description" type="string" value="GtkMathView"/>
+               <oaf_attribute name="bonobo:editable" type="boolean" value="false"/>
+               <oaf_attribute name="bonobo:supported_mime_types" type="stringv">
+                       <item value="text/xml"/>
+               </oaf_attribute>
+</oaf_server>
+
+</oaf_info>    

diff --git a/helm/gtkmathview-bonobo/src/Makefile.am b/helm/gtkmathview-bonobo/src/Makefile.am
index b5dbb421b4095fb2a9cebb0ac92bd64e8e7e8f0a..e211a3861bd35236d42d75bd5d2ca22b93b03550 100644 (file)
--- a/helm/gtkmathview-bonobo/src/Makefile.am
+++ b/helm/gtkmathview-bonobo/src/Makefile.am
@@ -1,4 +1,10 @@
 
+location = $(libdir)/libgtkmathview-bonobo.so
+serverdir = $(libdir)/bonobo/servers
+server_in_files = GNOME_GtkMathView.server.in.in
+
+CLEANFILES = $(server_in_files:.server.in.in=.server)
+
 lib_LTLIBRARIES = libgtkmathview-bonobo.la
 
 libgtkmathview_bonobo_la_LIBADD = $(GTKMATHVIEW_LIBS) $(BONOBOUI_LIBS) $(BONOBO_LIBS)
@@ -12,6 +18,10 @@ pkginclude_HEADERS = \
   control-factory.h \
   persist-file.h
 
+server_DATA = $(server_in_files:.server.in.in=.server)
+$(server_in_files:.server.in.in=.server): $(server_in_files:.server.in.in=.server.in) Makefile
+       sed -e "s|\@GTKMATHVIEW_FACTORY_LOCATION\@|$(location)|g" $< >$@
+
 INCLUDES = \
   $(BONOBOUI_CFLAGS) \
   $(BONOBO_CFLAGS) \