[Nautilus-list] Merge error with start-here

[Alex Larsson <alexl redhat com>]

While merging the start-here patches i made an error, the sysconfig and 
serverconfig directories are not meant to be in /etc/X11/starthere, but in 
/etc/X11 directory.

The current state shows duplicate of serverconfig and sysconfig in 
start-here:, and the links to serverconfig and sysconfig don't work.

I'm checking in this patch:
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.4769
diff -u -p -r1.4769 ChangeLog
--- ChangeLog	2001/10/01 16:48:00	1.4769
+++ ChangeLog	2001/10/01 18:34:26
@@ -1,3 +1,9 @@
+2001-10-01  Alex Larsson  <alexl redhat com>
+
+	* data/Makefile.am (install-data-local):
+	Move sysconfig and serverconfig out of starthere.
+	That was a merge error.
+
 2001-10-01  Darin Adler  <darin bentspoon com>
 
 	* README: Updated tags and build order in the README to match
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/data/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- data/Makefile.am	2001/09/05 17:12:15	1.13
+++ data/Makefile.am	2001/10/01 18:34:26
@@ -56,8 +56,8 @@ SUBDIRS = \
 
 install-data-local: $(DIRECTORY_FILES)
 	$(mkinstalldirs) $(sysconfdir)/X11/starthere
-	$(mkinstalldirs) $(sysconfdir)/X11/starthere/sysconfig
-	$(mkinstalldirs) $(sysconfdir)/X11/starthere/serverconfig
+	$(mkinstalldirs) $(sysconfdir)/X11/sysconfig
+	$(mkinstalldirs) $(sysconfdir)/X11/serverconfig
 	$(INSTALL_DATA) starthere.directory $(sysconfdir)/X11/starthere/.directory
-	$(INSTALL_DATA) sysconfig.directory $(sysconfdir)/X11/starthere/sysconfig/.directory
-	$(INSTALL_DATA) serverconfig.directory $(sysconfdir)/X11/starthere/serverconfig/.directory
+	$(INSTALL_DATA) sysconfig.directory $(sysconfdir)/X11/sysconfig/.directory
+	$(INSTALL_DATA) serverconfig.directory $(sysconfdir)/X11/serverconfig/.directory