summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-04 13:22:52 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-04 13:22:52 -0700
commitf1efec76814500a14acf7c64184ebef1a28e264d (patch)
tree9ffb7dc636460fd3a3f02a605f2e2adb698f906e
parentdc857b78c00432de6d57124ca2e060ef0a76684f (diff)
Fixed filename conflict during compilation on case-insensitive file systems.
-rw-r--r--Makefile.am22
-rw-r--r--app-defaults/Xedit-color.ad (renamed from Xedit-color.ad)0
-rw-r--r--app-defaults/Xedit-noxprint.ad (renamed from Xedit-noxprint.ad)0
-rw-r--r--app-defaults/Xedit-sample (renamed from Xedit-sample)0
-rw-r--r--app-defaults/Xedit-xprint.ad (renamed from Xedit-xprint.ad)0
5 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index db9a4e7..5d24e60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -164,15 +164,15 @@ lisp_re_tests_SOURCES = lisp/re/tests.c
# App default files (*.ad)
APPDEFAULTFILES = \
- Xedit-color \
- Xedit
+ app-defaults/Xedit-color \
+ app-defaults/Xedit
if USE_XPRINT
-Xedit.ad:
- cp $(top_srcdir)/Xedit-xprint.ad Xedit.ad
+app-defaults/Xedit.ad:
+ cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad
else
-Xedit.ad:
- cp $(top_srcdir)/Xedit-noxprint.ad Xedit.ad
+app-defaults/Xedit.ad:
+ cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad
endif
SUFFIXES = .ad
@@ -183,7 +183,7 @@ SUFFIXES = .ad
appdefaultdir = @appdefaultdir@
appdefault_DATA = $(APPDEFAULTFILES)
-CLEANFILES = $(APPDEFAULTFILES) Xedit.ad
+CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad
lispdir = $(LISPDIR)
dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \
@@ -213,10 +213,10 @@ dist_progmodes_DATA = \
appman_PRE = xedit.man
EXTRA_DIST = \
- Xedit-color.ad \
- Xedit-xprint.ad \
- Xedit-noxprint.ad \
- Xedit-sample \
+ app-defaults/Xedit-color.ad \
+ app-defaults/Xedit-xprint.ad \
+ app-defaults/Xedit-noxprint.ad \
+ app-defaults/Xedit-sample \
lisp/README \
lisp/TODO \
lisp/compile.c \
diff --git a/Xedit-color.ad b/app-defaults/Xedit-color.ad
index da811b9..da811b9 100644
--- a/Xedit-color.ad
+++ b/app-defaults/Xedit-color.ad
diff --git a/Xedit-noxprint.ad b/app-defaults/Xedit-noxprint.ad
index b626bf3..b626bf3 100644
--- a/Xedit-noxprint.ad
+++ b/app-defaults/Xedit-noxprint.ad
diff --git a/Xedit-sample b/app-defaults/Xedit-sample
index cd4786a..cd4786a 100644
--- a/Xedit-sample
+++ b/app-defaults/Xedit-sample
diff --git a/Xedit-xprint.ad b/app-defaults/Xedit-xprint.ad
index 34ed4e9..34ed4e9 100644
--- a/Xedit-xprint.ad
+++ b/app-defaults/Xedit-xprint.ad