--- Makefile.in.orig	Wed Nov 29 15:02:07 2000
+++ Makefile.in	Wed Nov 29 15:04:28 2000
@@ -169,9 +169,9 @@
 @USING_OAF_TRUE@SUBDIRS_OAF = libgnomevfs-corba
 @USING_OAF_FALSE@SUBDIRS_OAF = 
 @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME = 
-@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = test mime-type-capplet
+@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = mime-type-capplet
 
-SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				$(SUBDIRS_OAF)					idl						modules						data						man						devel-docs					$(SUBDIRS_GNOME)				po
+SUBDIRS =  	libgnomevfs					libgnomevfs-pthread				$(SUBDIRS_OAF)					idl						modules						data						man						$(SUBDIRS_GNOME)				po
 
 
 EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					vfsConf.sh.in					vfscorbaConf.sh.in				vfspthreadConf.sh.in				gnome-vfs-config.in
@@ -179,7 +179,7 @@
 
 bin_SCRIPTS = $(top_builddir)/gnome-vfs-config
 
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
 confexec_DATA =  	vfsConf.sh					vfscorbaConf.sh					vfspthreadConf.sh
 
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -539,6 +539,7 @@
 
 gnome-vfs-config: gnome-vfs-config.in Makefile
 	sed -e 's?\@LIBDIR\@?$(libdir)?g' \
+	    -e 's?\@SYSCONFDIR\@?$(sysconfdir)?g' \
 	    -e 's?\@VFS_LIBDIR\@?$(VFS_LIBDIR)?g' \
 	    -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \
 	    -e 's?\@VERSION\@?$(VERSION)?g' \