summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorAlex Larsson <alexl@redhat.com>2001-10-01 18:38:26 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-10-01 18:38:26 +0000
commit27a8b1d24a95d33601b3954613aa5432f814298f (patch)
tree59fc5a998b27906f69f836869f69d5f63b7cef50 /data
parentcfcc2bf5172300028e900d0f22b3f402a8ef6ab4 (diff)
downloadnautilus-27a8b1d24a95d33601b3954613aa5432f814298f.tar.gz
Move sysconfig and serverconfig out of starthere. That was a merge error.
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.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index fd76d553b..f48f9b4bb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -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