stable bonobo fixes landed

[Havoc Pennington <hp redhat com>]

Hi,

You are getting the idea by now.

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.1113
diff -u -p -u -r1.1113 ChangeLog
--- ChangeLog	2001/09/18 23:00:06	1.1113
+++ ChangeLog	2001/09/19 18:54:58
@@ -1,3 +1,9 @@
+2001-09-19  Havoc Pennington  <hp redhat com>
+
+	* configure.in (BONOBO_INCLUDEDIR): update
+
+	* bonobo/Makefile.am (libbonoboincludedir): move headers
+
 2001-09-18  Ettore Perazzoli  <ettore ximian com>
 
 	* bonobo/bonobo-ui-toolbar.c (show_popup_window): CLAMP() the x/y
Index: configure.in
===================================================================
RCS file: /cvs/gnome/bonobo/configure.in,v
retrieving revision 1.169
diff -u -p -u -r1.169 configure.in
--- configure.in	2001/09/15 15:41:08	1.169
+++ configure.in	2001/09/19 18:54:58
@@ -322,7 +322,7 @@ dnl
 dnl For the various bonoboConf.sh scripts generation.
 dnl
 BONOBO_LIBDIR='-L${libdir}'
-BONOBO_INCLUDEDIR="-I${includedir} `$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print oaf xml`"
+BONOBO_INCLUDEDIR="-I${includedir}/gnome-1.0 `$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print oaf xml`"
 BONOBO_LIBS="-lbonobo `$GNOME_CONFIG --libs oaf gtk gnome`"
 BONOBOX_LIBS="$BONOBO_LIBS -lbonobox `$GNOME_CONFIG --libs gnomeui gdk_pixbuf xml`"
 BONOBOX_PRINT_LIBS="$BONOBOX_LIBS -lbonobo-print `$GNOME_CONFIG --libs print`"
Index: bonobo/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/Makefile.am,v
retrieving revision 1.171
diff -u -p -u -r1.171 Makefile.am
--- bonobo/Makefile.am	2001/04/16 23:25:54	1.171
+++ bonobo/Makefile.am	2001/09/19 18:54:58
@@ -94,7 +94,7 @@ libbonobo_la_SOURCES =			\
 	bonobo-property-control.c	\
 	bonobo-running-context.c
 
-libbonoboincludedir = $(includedir)/bonobo
+libbonoboincludedir = $(includedir)/gnome-1.0/bonobo
 
 libbonobodir = $(includedir)
 
@@ -233,7 +233,7 @@ libbonobo_print_la_SOURCES =		\
 	bonobo-print.c			\
 	bonobo-print-client.c
 
-libbonobo_printincludedir = $(includedir)/bonobo
+libbonobo_printincludedir = $(includedir)/gnome-1.0/bonobo
 
 libbonobo_printinclude_HEADERS =		\
 	Bonobo.h			\