--- src/daemon/Makefile.in.orig	Tue Mar  2 18:48:38 1999
+++ src/daemon/Makefile.in	Tue Mar  2 18:49:07 1999
@@ -191,7 +191,7 @@
 
 
 libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h
-libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la 				  @LIBSUPPORT@
+libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la 				  @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@
 
 
 EXTRA_DIST = server_config.h.in server_config.pl
--- Makefile.in.orig	Mon May 31 08:47:42 1999
+++ Makefile.in	Mon Jul 12 12:54:34 1999
@@ -182,7 +182,7 @@
 
 
 include_HEADERS = glibtop.h
-configincludedir = $(pkglibdir)/include
+configincludedir = $(includedir)
 
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in 	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 	RELNOTES-1.0 libgtop-sysdeps.m4 README NEWS.old libgtop-mirror.sh
 
@@ -192,7 +192,7 @@
 
 BUILT_SOURCES = stamp-gc-h #note: not glibtop-config.h
 
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
 confexec_DATA = $(top_builddir)/libgtopConf.sh 		  $(top_builddir)/libgtop-features.def
 
 
@@ -587,7 +587,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_DATADIR\@#$(datadir)#g' \
 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
@@ -616,7 +616,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