[monkey-bubble: 572/753] Reverted this: 2001-07-30 Michael Meeks <michael ximian com>



commit da1b5990e6a5bc30c18c43666bdccc94abff8526
Author: Michael Meeks <michael ximian com>
Date:   Tue Jul 31 14:18:50 2001 +0000

    Reverted this:
    2001-07-30  Michael Meeks  <michael ximian com>
    
    	* Makefile.am (gnomeincludedir): actualy install libgnome.h

 libgnome/ChangeLog   |    4 ----
 libgnome/Makefile.am |    7 +++++--
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index 4a414ea..4956eba 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -3,10 +3,6 @@
 	* gnome-ditem.[ch]: Removed. This will be moved to gnome-core when George is
 	back from his holidays.
 
-2001-07-30  Michael Meeks  <michael ximian com>
-
-	* Makefile.am (gnomeincludedir): actualy install libgnome.h
-
 2001-07-27  Martin Baulig  <baulig suse de>
 
 	* libgnome-marshal.list: VOID:STRING,INT,UINT,BOXED -> VOID:STRING,INT,UINT.
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index c405061..9a4d351 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -13,7 +13,8 @@ lib_LTLIBRARIES = libgnome-2.la
 
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-gnomeincludedir = $(includedir)/gnome/2/libgnome
+libincludedir = $(includedir)/gnome/2
+
 libgnomeincludedir = $(includedir)/gnome/2/libgnome
 
 INCLUDES = \
@@ -64,6 +65,9 @@ libgnome_2_la_SOURCES = \
 	$(libgnome_src)		\
 	$(CORBA_SOURCE)
 
+libinclude_HEADERS = \
+	libgnome.h
+
 libgnome_headers = \
 	gnome-program.h		\
 	gnome-i18n.h		\
@@ -78,7 +82,6 @@ libgnome_headers = \
 libgnomeinclude_HEADERS = \
 	Gnome.h			\
 	libgnometypebuiltins.h	\
-	libgnome.h		\
 	$(libgnome_headers)
 
 noinst_HEADERS = \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]