[monkey-bubble: 449/753] Install libgnome.h in `$(includedir)/gnome/2' to make it consistent with

[Sven Herzberg <herzi src gnome org>]

commit 0b6c5d7b569fbe3074293814f722f5fa7d97ea53
Author: Martin Baulig <baulig suse de>
Date:   Wed Jun 13 18:36:52 2001 +0000

    Install libgnome.h in `$(includedir)/gnome/2' to make it consistent with
    
    2001-06-13  Martin Baulig  <baulig suse de>
    
    	* Makefile.am: Install libgnome.h in `$(includedir)/gnome/2' to make it
    	consistent with Bonobo.
    
    	* libgnome.h: You now use #include <libgnome.h> to get this.

 libgnome/ChangeLog   |    7 +++++++
 libgnome/Makefile.am |   10 +++++++---
 libgnome/libgnome.h  |    4 ----
 3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index 4e5f005..f6e7c6d 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,5 +1,12 @@
 2001-06-13  Martin Baulig  <baulig suse de>
 
+	* Makefile.am: Install libgnome.h in `$(includedir)/gnome/2' to make it
+	consistent with Bonobo.
+
+	* libgnome.h: You now use #include <libgnome.h> to get this.
+
+2001-06-13  Martin Baulig  <baulig suse de>
+
 	* gnome-selector.[ch]: Moved to libgnome-extra/libgnome/.
 	* gnome-selector-factory.[ch]: Likewise.
 	* gnome-async-context.[ch]: Likewise.
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 7bf7da1..e87f314 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -13,7 +13,9 @@ lib_LTLIBRARIES = libgnome-2.la
 
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-libgnomeincludedir = $(includedir)/gnome/$(GNOME_INTERFACE_VERSION)/libgnome
+libincludedir = $(includedir)/gnome/2
+
+libgnomeincludedir = $(includedir)/gnome/2/libgnome
 
 INCLUDES = \
 	-I..					\
@@ -73,6 +75,9 @@ libgnome_2_la_SOURCES = \
 	$(libgnome_src)		\
 	$(CORBA_SOURCE)
 
+lib_headers = \
+	libgnome.h
+
 libgnome_headers = \
 	gnome-program.h		\
 	gnome-i18n.h		\
@@ -85,8 +90,7 @@ libgnome_headers = \
 	gnome-util.h   		\
 	gnome-preferences.h	\
 	gnome-marshal.h		\
-	libgnome-init.h		\
-	libgnome.h
+	libgnome-init.h
 
 libgnomeinclude_HEADERS = \
 	Gnome.h			\
diff --git a/libgnome/libgnome.h b/libgnome/libgnome.h
index 3d9f0b3..b6c3e2f 100644
--- a/libgnome/libgnome.h
+++ b/libgnome/libgnome.h
@@ -44,8 +44,4 @@
 
 #include <libgnome/libgnome-init.h>
 
-#ifdef COMPAT_1_0
-#include <compat/1.0/libgnome/libgnome-compat-1.0.h>
-#endif
-
 #endif /* LIBGNOME_H */