--- lib/Makefile.in.orig	Wed Jan  6 03:54:31 1999
+++ lib/Makefile.in	Thu Jan  7 21:47:02 1999
@@ -129,7 +129,7 @@
 LT_CURRENT = @LT_CURRENT@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
-LT_VERSION_INFO = @LT_VERSION_INFO@
+LT_VERSION_INFO = -version-info 1:0:0
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 NM = @NM@
--- sysdeps/common/Makefile.in.orig	Wed Jan  6 03:53:49 1999
+++ sysdeps/common/Makefile.in	Thu Jan  7 21:47:02 1999
@@ -129,7 +129,7 @@
 LT_CURRENT = @LT_CURRENT@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
-LT_VERSION_INFO = @LT_VERSION_INFO@
+LT_VERSION_INFO = -version-info 1:0:0
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 NM = @NM@
--- sysdeps/freebsd/Makefile.in.orig	Wed Jan  6 03:54:24 1999
+++ sysdeps/freebsd/Makefile.in	Thu Jan  7 21:47:02 1999
@@ -129,7 +129,7 @@
 LT_CURRENT = @LT_CURRENT@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
-LT_VERSION_INFO = @LT_VERSION_INFO@
+LT_VERSION_INFO = -version-info 1:0:0
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 NM = @NM@
--- sysdeps/names/Makefile.in.orig	Wed Jan  6 03:54:09 1999
+++ sysdeps/names/Makefile.in	Thu Jan  7 21:47:02 1999
@@ -129,7 +129,7 @@
 LT_CURRENT = @LT_CURRENT@
 LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
-LT_VERSION_INFO = @LT_VERSION_INFO@
+LT_VERSION_INFO = -version-info 1:0:0
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 NM = @NM@
--- sysdeps/guile/Makefile.in.orig	Fri Jan  8 11:23:00 1999
+++ sysdeps/guile/Makefile.in	Fri Jan  8 11:26:57 1999
@@ -126,9 +126,9 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
+LT_CURRENT = 1
+LT_RELEASE = 0
+LT_REVISION = 0
 LT_VERSION_INFO = @LT_VERSION_INFO@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- sysdeps/guile/names/Makefile.in.orig	Wed Jan  6 03:54:02 1999
+++ sysdeps/guile/names/Makefile.in	Fri Jan  8 11:27:22 1999
@@ -126,9 +126,9 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
+LT_CURRENT = 1
+LT_RELEASE = 0
+LT_REVISION = 0
 LT_VERSION_INFO = @LT_VERSION_INFO@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
--- Makefile.in.orig	Tue Jan  5 21:53:28 1999
+++ Makefile.in	Wed Jan 20 00:33:09 1999
@@ -172,8 +172,7 @@
 
 @BUILD_GNOME_SUPPORT_TRUE@support = support
 
-SUBDIRS = po intl $(support) macros misc include sysdeps lib src \
-	  $(examples_SUBDIRS)
+SUBDIRS = po intl macros misc include sysdeps lib src
 
 include_HEADERS = glibtop.h
 
@@ -182,7 +181,7 @@
 	libgtop-sysdeps.m4 ANNOUNCE ANNOUNCE-0.25 README.LATEST \
 	libgtop-mirror.sh
 
-confexecdir	= $(libdir)
+confexecdir	= $(sysconfdir)
 confexec_DATA	= $(top_builddir)/libgtopConf.sh \
 		  $(top_builddir)/libgtop-features.def
 
@@ -511,7 +510,7 @@
 $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
 
 libgtopConf.sh: libgtopConf.sh.in Makefile
-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
@@ -539,7 +538,7 @@
 	  && mv libgtopConf.tmp libgtopConf.sh
 
 libgtop-config: libgtop-config.in Makefile
-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
 	  && mv libgtop-config.tmp libgtop-config && \
 		chmod 755 libgtop-config
--- po/Makefile.in.in.orig	Wed Jan  6 03:50:44 1999
+++ po/Makefile.in.in	Thu Jan  7 21:47:02 1999
@@ -18,7 +18,7 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+datadir = $(prefix)/share
 localedir = $(datadir)/locale
 gnulocaledir = $(prefix)/share/locale
 gettextsrcdir = $(prefix)/share/gettext/po