parallel install fixes for bonobo-config

[Havoc Pennington <hp redhat com>]

Hi,

Appended, OK to commit?

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo-config/ChangeLog,v
retrieving revision 1.120
diff -u -p -u -r1.120 ChangeLog
--- ChangeLog	2001/09/28 05:21:04	1.120
+++ ChangeLog	2001/10/05 15:58:31
@@ -1,3 +1,19 @@
+2001-10-05  Havoc Pennington  <hp redhat com>
+
+	* autogen.sh (srcdir): kill CERTIFIED_GNOMIE
+
+	* configure.in: kill CERTIFIED_GNOMIE
+
+	* bonobo-config-2.0.pc.in (idldir): change idldir
+
+	* idl/Makefile.am (idldir): move IDL to a subdir
+
+	* monikers/Bonobo_Moniker_gconf.server.in, Makefile.am: rename
+	libmoniker_gconf to libmoniker_gconf2
+
+	* monikers/Bonobo_Moniker_xmldb.server.in, Makefile.am: rename
+	bonobo-moniker-xmldb to bonobo-moniker-xmldb-2
+
 2001-09-29  Michael Meeks  <michael ximian com>
 
 	* configure.in: remove slow and duplicated alignment checks.
Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/bonobo-config/autogen.sh,v
retrieving revision 1.4
diff -u -p -u -r1.4 autogen.sh
--- autogen.sh	2001/05/21 17:09:03	1.4
+++ autogen.sh	2001/10/05 15:58:31
@@ -4,13 +4,6 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-if test -z "$CERTIFIED_GNOMIE"; then
-# If you can't figure out how to set this envar, please don't come on IRC
-# whining incessantly about how your apps are broken.
-  cat $srcdir/message-of-doom
-  exit 1
-fi
-
 PKG_NAME="bonobo-config"
 
 (test -f $srcdir/configure.in \
Index: bonobo-config-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/bonobo-config/bonobo-config-2.0.pc.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 bonobo-config-2.0.pc.in
--- bonobo-config-2.0.pc.in	2001/08/14 18:36:43	1.1
+++ bonobo-config-2.0.pc.in	2001/10/05 15:58:31
@@ -2,7 +2,7 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
-idldir= datadir@/idl
+idldir= datadir@/idl/bonobo-config-2.0
 
 Name: bonobo-config
 Description: Bonobo configuration moniker infastructure
Index: configure.in
===================================================================
RCS file: /cvs/gnome/bonobo-config/configure.in,v
retrieving revision 1.43
diff -u -p -u -r1.43 configure.in
--- configure.in	2001/09/28 05:21:04	1.43
+++ configure.in	2001/10/05 15:58:31
@@ -5,11 +5,6 @@ AM_INIT_AUTOMAKE(bonobo-config, 0.103.0)
 
 AM_MAINTAINER_MODE
 
-if test -z "$CERTIFIED_GNOMIE"; then
-  cat $srcdir/message-of-doom
-  exit 1
-fi
-
 GNOME_COMMON_INIT
 GNOME_PLATFORM_GNOME_2(yes, force)
 
Index: idl/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-config/idl/Makefile.am,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile.am
--- idl/Makefile.am	2001/04/04 15:50:26	1.3
+++ idl/Makefile.am	2001/10/05 15:58:31
@@ -1,4 +1,4 @@
-idldir = $(datadir)/idl
+idldir = $(datadir)/idl/bonobo-config-2.0
 
 idl_DATA = Bonobo_Config.idl
 
Index: monikers/Bonobo_Moniker_gconf.server.in
===================================================================
RCS file: /cvs/gnome/bonobo-config/monikers/Bonobo_Moniker_gconf.server.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 Bonobo_Moniker_gconf.server.in
--- monikers/Bonobo_Moniker_gconf.server.in	2001/04/03 15:36:09	1.1
+++ monikers/Bonobo_Moniker_gconf.server.in	2001/10/05 15:58:31
@@ -1,6 +1,6 @@
 <oaf_info>
 
-<oaf_server iid="OAFIID:Bonobo_Moniker_gconf_Factory" type="shlib" location="@MONIKER_LIBDIR@/libmoniker_gconf.so">
+<oaf_server iid="OAFIID:Bonobo_Moniker_gconf_Factory" type="shlib" location="@MONIKER_LIBDIR@/libmoniker_gconf2.so">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:GNOME/GenericFactory:1.0"/>
 	</oaf_attribute>
Index: monikers/Makefile.am
===================================================================
RCS file: /cvs/gnome/bonobo-config/monikers/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- monikers/Makefile.am	2001/08/30 13:38:21	1.16
+++ monikers/Makefile.am	2001/10/05 15:58:31
@@ -32,14 +32,14 @@ Bonobo_Moniker_ditem.server.in: Bonobo_M
 clean-local:
 	-rm -f $(SERVER_FILES)
 
-bin_PROGRAMS = bonobo-moniker-xmldb bonobo-moniker-ditem
+bin_PROGRAMS = bonobo-moniker-xmldb-2 bonobo-moniker-ditem
 
-bonobo_moniker_xmldb_SOURCES =			\
+bonobo_moniker_xmldb_2_SOURCES =			\
 	bonobo-config-xmldb.c			\
 	bonobo-config-xmldb.h			\
 	bonobo-moniker-xmldb.c
 
-bonobo_moniker_xmldb_LDADD = $(BONOBO_CONFIG_LIBS) ../bonobo-config/libbonobo_config.la
+bonobo_moniker_xmldb_2_LDADD = $(BONOBO_CONFIG_LIBS) ../bonobo-config/libbonobo_config.la
 
 bonobo_moniker_ditem_SOURCES =	 		\
 	bonobo-moniker-ditem.c 			\
@@ -50,14 +50,14 @@ bonobo_moniker_ditem_LDADD = $(BONOBO_CO
 
 monikerdir = $(libdir)/bonobo/monikers
 
-moniker_LTLIBRARIES = libmoniker_config.la libmoniker_gconf.la
+moniker_LTLIBRARIES = libmoniker_config.la libmoniker_gconf2.la
 
-libmoniker_gconf_la_SOURCES = 			\
+libmoniker_gconf2_la_SOURCES = 			\
 	bonobo-moniker-gconf.c			\
 	bonobo-config-gconfdb.h			\
 	bonobo-config-gconfdb.c			
 
-libmoniker_gconf_la_LIBADD = $(BONOBO_CONFIG_GCONF_LIBS) \
+libmoniker_gconf2_la_LIBADD = $(BONOBO_CONFIG_GCONF_LIBS) \
 	../bonobo-config/libbonobo_config.la
 
 libmoniker_config_la_SOURCES =	 		\