patch for libbonoboui

[Rodrigo Moya <rodrigo gnome-db org>]

Hi!

I just applied these 2 patches to libbonoboui (approved by Michael).

cheers

PS: ignore the diff for the server.in files, as they're not any more on CVS.

-- 
Rodrigo Moya <rodrigo gnome-db org> - <rodrigo ximian com>
http://www.gnome-db.org/ - http://www.ximian.com/

? samples/compound-doc/bonobo-hello/Bonobo_Sample_Hello.server.in.in
? samples/controls/Bonobo_Sample_Controls.server.in.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.191
diff -u -r1.191 ChangeLog
--- ChangeLog	2001/12/04 16:57:30	1.191
+++ ChangeLog	2001/12/06 20:40:01
@@ -1,3 +1,10 @@
+2001-12-06  Rodrigo Moya <rodrigo gnome-db org>
+
+	* samples/compound-doc/bonobo-hello/Makefile.am:
+	* samples/controls/Makefile.am: install sample servers in
+	$(prefix)/lib/bonobo-2.0/samples, and added server.in.in files
+	and needed Makefile rules for converting them to server.in
+
 2001-12-04  Darin Adler  <darin bentspoon com>
 
 	* bonobo/bonobo-ui-toolbar.c: (impl_destroy): Sink the tooltips
Index: samples/compound-doc/bonobo-hello/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/compound-doc/bonobo-hello/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- samples/compound-doc/bonobo-hello/Makefile.am	2001/10/29 17:17:30	1.11
+++ samples/compound-doc/bonobo-hello/Makefile.am	2001/12/06 20:40:01
@@ -1,9 +1,13 @@
+Bonobo_Sample_Hello.server.in: Bonobo_Sample_Hello.server.in.in
+	sed -e "s|\ prefix\@|$(prefix)|" $< > $@
+
 INCLUDES =						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-I$(top_srcdir) 				\
 	$(LIBBONOBOUI_CFLAGS)
 
-bin_PROGRAMS = bonobo-sample-hello
+samplesdir = $(prefix)/lib/bonobo-2.0/samples
+samples_PROGRAMS = bonobo-sample-hello
 
 bonobo_sample_hello_SOURCES =	\
 	bonobo-hello.c		\
Index: samples/controls/Bonobo_Sample_Controls.server.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/controls/Bonobo_Sample_Controls.server.in,v
retrieving revision 1.4
diff -u -r1.4 Bonobo_Sample_Controls.server.in
--- samples/controls/Bonobo_Sample_Controls.server.in	2001/10/08 03:21:20	1.4
+++ samples/controls/Bonobo_Sample_Controls.server.in	2001/12/06 20:40:01
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_ControlFactory" type="exe"
-	location="bonobo-sample-controls-2">
+	location="/gnome/head/INSTALL/lib/bonobo-2.0/samples/bonobo-sample-controls-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>
Index: samples/controls/Makefile.am
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/controls/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- samples/controls/Makefile.am	2001/10/29 17:17:31	1.20
+++ samples/controls/Makefile.am	2001/12/06 20:40:01
@@ -1,4 +1,8 @@
-bin_PROGRAMS = bonobo-sample-controls-2
+Bonobo_Sample_Controls.server.in: Bonobo_Sample_Controls.server.in.in
+	sed -e "s|\ prefix\@|$(prefix)|" $< > $@
+
+samplesdir = $(prefix)/lib/bonobo-2.0/samples
+samples_PROGRAMS = bonobo-sample-controls-2
 
 INCLUDES =	\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \

Index: samples/compound-doc/bonobo-hello/Bonobo_Sample_Hello.server.in.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/compound-doc/bonobo-hello/Bonobo_Sample_Hello.server.in.in,v
retrieving revision 1.10
diff -u -r1.10 Bonobo_Sample_Hello.server.in.in
--- samples/compound-doc/bonobo-hello/Bonobo_Sample_Hello.server.in.in	2000/12/28 14:12:42	1.10
+++ samples/compound-doc/bonobo-hello/Bonobo_Sample_Hello.server.in.in	2001/12/07 13:24:15
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_Hello_EmbeddableFactory" type="exe"
-	location="bonobo-sample-hello">
+	location="@prefix@/lib/bonobo-2.0/samples/bonobo-sample-hello">
   <oaf_attribute name="repo_ids" type="stringv">
     <item value="IDL:GNOME/ObjectFactory:1.0"/>
   </oaf_attribute>
Index: samples/controls/Bonobo_Sample_Controls.server.in.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/samples/controls/Bonobo_Sample_Controls.server.in.in,v
retrieving revision 1.4
diff -u -r1.4 Bonobo_Sample_Controls.server.in.in
--- samples/controls/Bonobo_Sample_Controls.server.in.in	2001/10/08 03:21:20	1.4
+++ samples/controls/Bonobo_Sample_Controls.server.in.in	2001/12/07 13:24:15
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:Bonobo_Sample_ControlFactory" type="exe"
-	location="bonobo-sample-controls-2">
+	location="@prefix@/lib/bonobo-2.0/samples/bonobo-sample-controls-2">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>