diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-09-26 17:47:32 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-09-26 17:47:32 -0300 |
| commit | d96491aad5542f052b722b94d86f0ce7661ae98b (patch) | |
| tree | 5648161d1b53fd785a607586b08914c49373fdb3 | |
| parent | cc7cb041c4144f1401fd520f05018028c0e0c87e (diff) | |
| parent | f1efec76814500a14acf7c64184ebef1a28e264d (diff) | |
Merge branch 'master' of ssh://pcpa@git.freedesktop.org/git/xorg/app/xedit
| -rw-r--r-- | Makefile.am | 22 | ||||
| -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 |