--- Makefile.in.orig	Tue Sep 29 07:46:39 1998
+++ Makefile.in	Sun Oct 25 00:55:24 1998
@@ -142,14 +142,14 @@
 
 SUBDIRS = po intl support macros \
 	tools	\
-	libgnome libgnomeui gtk-xmhtml gnome-hello zvt \
-	$(GNORBA) idl test-gnome test-suite devel-docs
+	libgnome libgnomeui gtk-xmhtml zvt \
+	$(GNORBA) idl
 
 include_HEADERS = gnome.h
 
 EXTRA_DIST = HACKING gnomeConf.sh.in gnome-config.in gnome-libs.spec
 
-confexecdir=$(libdir)
+confexecdir=$(datadir)
 confexec_DATA = gnomeConf.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- gtk-xmhtml/Makefile.in.orig	Wed Sep 23 23:51:20 1998
+++ gtk-xmhtml/Makefile.in	Sat Sep 26 22:02:26 1998
@@ -133,7 +133,7 @@
 libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml
 
 INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \
-           -DWITH_GTK -DDEBUG -DGNOME_LIB
+           -DWITH_GTK -DGNOME_LIB
 
 lib_LTLIBRARIES = libgtkxmhtml.la
 
@@ -183,7 +183,7 @@
 	gtk-xmhtml.h		\
 	toolkit.h
 
-libgtkxmhtml_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libgtkxmhtml_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
 libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS)
 
 bin_PROGRAMS = htmltest
@@ -228,7 +228,7 @@
 SOURCES = $(libgtkxmhtml_la_SOURCES) $(htmltest_SOURCES)
 OBJECTS = $(libgtkxmhtml_la_OBJECTS) $(htmltest_OBJECTS)
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
@@ -474,7 +474,7 @@
 check: all
 	$(MAKE)
 installcheck:
-install-exec: install-libLTLIBRARIES install-binPROGRAMS
+install-exec: install-libLTLIBRARIES
 	@$(NORMAL_INSTALL)
 
 install-data: install-libgtkxmhtmlincludeHEADERS
--- libgnome/Makefile.in.orig	Wed Sep 23 23:51:08 1998
+++ libgnome/Makefile.in	Sat Sep 26 23:07:56 1998
@@ -148,7 +148,7 @@
 	-DGNOMEDATADIR=\""$(datadir)"\" \
 	-DGNOMEBINDIR=\""$(bindir)"\" \
 	-DGNOMELOCALSTATEDIR=\""$(localstatedir)"\" \
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" \
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl
 
 libgnome_la_SOURCES = \
@@ -203,10 +203,10 @@
 
 EXTRA_DIST = lib_date.README
 
-libgnome_la_LDFLAGS = -version-info 30:0:30 -rpath $(libdir)
+libgnome_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
 libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
 
-bin_PROGRAMS = dns-helper gnome-dump-metadata
+bin_PROGRAMS = gnome-dump-metadata
 
 dns_helper_SOURCES = dns-helper.c
 dns_helper_LDADD = $(NSL_LIBS)
@@ -251,7 +251,7 @@
 SOURCES = $(libgnome_la_SOURCES) $(dns_helper_SOURCES) $(gnome_dump_metadata_SOURCES)
 OBJECTS = $(libgnome_la_OBJECTS) $(dns_helper_OBJECTS) $(gnome_dump_metadata_OBJECTS)
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
--- libgnomeui/Makefile.in.orig	Wed Sep 23 23:51:14 1998
+++ libgnomeui/Makefile.in	Sat Sep 26 22:09:11 1998
@@ -150,7 +150,7 @@
         -DGNOMEDATADIR=\""$(datadir)"\" \
         -DGNOMEBINDIR=\""$(bindir)"\" \
         -DGNOMELOCALSTATEDIR=\""$(localstatedir)"\" \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+        -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"
 
 libgnomeui_la_SOURCES = \
 	gnome-about.c			\
@@ -301,7 +301,7 @@
 	gnometypebuiltins_ids.c			\
 	gnometypebuiltins_evals.c
 
-libgnomeui_la_LDFLAGS = -version-info 30:0:30 -rpath $(libdir)
+libgnomeui_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
 libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
 
 gnome_segv_LDADD =	\
@@ -1086,9 +1086,9 @@
 check: all-am
 	$(MAKE) check-recursive
 installcheck: installcheck-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 
-install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+install-exec-am: install-libLTLIBRARIES
 
 install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
 
--- libgnorba/Makefile.in.orig	Sat Sep 26 22:10:13 1998
+++ libgnorba/Makefile.in	Sat Sep 26 22:10:48 1998
@@ -156,7 +156,7 @@
 	name-service.h \
 	gnorba.h
 
-libgnorba_la_LDFLAGS = -version-info 26:0:26 -rpath $(libdir)
+libgnorba_la_LDFLAGS = -version-info 0:30:0 -rpath $(libdir)
 libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
--- support/Makefile.in.orig	Wed Sep 23 23:51:02 1998
+++ support/Makefile.in	Sat Sep 26 22:39:02 1998
@@ -130,7 +130,7 @@
 l = @l@
 need_gnome_support = @need_gnome_support@
 
-supportincludedir = $(pkglibdir)/include
+supportincludedir = $(includedir)
 
 @BUILD_GNOME_SUPPORT_TRUE@INCLUDES = -D_GNU_SOURCE
 
@@ -149,7 +149,7 @@
 # gnomesupport.h is listed here to ensure that it is built
 @BUILD_GNOME_SUPPORT_TRUE@libgnomesupport_la_SOURCES = gnomesupport.h long-options.c gnome-argp.c
 @BUILD_GNOME_SUPPORT_TRUE@libgnomesupport_la_LIBADD  = @LTLIBOBJS@
-@BUILD_GNOME_SUPPORT_TRUE@libgnomesupport_la_LDFLAGS = -version-info 0:0:0
+@BUILD_GNOME_SUPPORT_TRUE@libgnomesupport_la_LDFLAGS = -version-info 0:30:0
 
 @BUILD_GNOME_SUPPORT_TRUE@BUILT_SOURCES = gnomesupport.h
 
--- zvt/Makefile.in.orig	Wed Sep 23 23:51:27 1998
+++ zvt/Makefile.in	Sat Sep 26 22:02:26 1998
@@ -197,7 +197,7 @@
 SOURCES = $(libzvt_la_SOURCES) $(zterm_SOURCES)
 OBJECTS = $(libzvt_la_OBJECTS) $(zterm_OBJECTS)
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
