diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2008-11-11 10:52:18 +0100 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-12 00:33:15 -0200 |
| commit | cfc78a1c2452362a5e7c88ed239c9d7ef0240a4d (patch) | |
| tree | 7ead62e0f74f4944326017a04b11a42861597a89 | |
| parent | 9d4a9520409fdb50987be6f4ca2c8afd5b53c994 (diff) | |
reorganize app default files
| -rw-r--r-- | Makefile.am | 41 | ||||
| -rw-r--r-- | app-defaults/Xedit-color (renamed from app-defaults/Xedit-color.ad) | 0 | ||||
| -rw-r--r-- | app-defaults/Xedit-noxprint (renamed from app-defaults/Xedit-noxprint.ad) | 0 | ||||
| -rw-r--r-- | app-defaults/Xedit-xprint (renamed from app-defaults/Xedit-xprint.ad) | 0 | ||||
| -rw-r--r-- | configure.ac | 3 |
5 files changed, 11 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 7c13340..0fad032 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,38 +161,13 @@ lisp_re_tests_LDADD = -L. -lre lisp_re_tests_SOURCES = lisp/re/tests.c -# App default files (*.ad) +# App default files -APPDEFAULTFILES = \ +appdefaultdir = @appdefaultdir@ +appdefault_DATA = \ app-defaults/Xedit-color \ app-defaults/Xedit -$(APPDEFAULTFILES): appsubdir - -.PHONY: appsubdir - -# Ensure ./app-defaults exists, avoiding race condition for parallel jobs -appsubdir: - test -d app-defaults || mkdir app-defaults - -if USE_XPRINT -app-defaults/Xedit.ad: - cp $(top_srcdir)/app-defaults/Xedit-xprint.ad app-defaults/Xedit.ad -else -app-defaults/Xedit.ad: - cp $(top_srcdir)/app-defaults/Xedit-noxprint.ad app-defaults/Xedit.ad -endif - -SUFFIXES = .ad - -.ad: - cp $< $@ - -appdefaultdir = @appdefaultdir@ -appdefault_DATA = $(APPDEFAULTFILES) - -CLEANFILES = $(APPDEFAULTFILES) app-defaults/Xedit.ad - lispdir = $(LISPDIR) dist_lisp_DATA = ${srcdir}/lisp/modules/lisp.lsp \ ${srcdir}/lisp/modules/xedit.lsp \ @@ -221,9 +196,9 @@ dist_progmodes_DATA = \ appman_PRE = xedit.man EXTRA_DIST = \ - app-defaults/Xedit-color.ad \ - app-defaults/Xedit-xprint.ad \ - app-defaults/Xedit-noxprint.ad \ + app-defaults/Xedit-color \ + app-defaults/Xedit-xprint \ + app-defaults/Xedit-noxprint \ app-defaults/Xedit-sample \ lisp/README \ lisp/TODO \ @@ -251,7 +226,7 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE) -CLEANFILES += $(appman_DATA) +CLEANFILES = $(appman_DATA) SED = sed @@ -272,7 +247,7 @@ MAN_SUBSTS = \ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' -SUFFIXES += .$(APP_MAN_SUFFIX) .man +SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ diff --git a/app-defaults/Xedit-color.ad b/app-defaults/Xedit-color index da811b9..da811b9 100644 --- a/app-defaults/Xedit-color.ad +++ b/app-defaults/Xedit-color diff --git a/app-defaults/Xedit-noxprint.ad b/app-defaults/Xedit-noxprint index b626bf3..b626bf3 100644 --- a/app-defaults/Xedit-noxprint.ad +++ b/app-defaults/Xedit-noxprint diff --git a/app-defaults/Xedit-xprint.ad b/app-defaults/Xedit-xprint index 34ed4e9..34ed4e9 100644 --- a/app-defaults/Xedit-xprint.ad +++ b/app-defaults/Xedit-xprint diff --git a/configure.ac b/configure.ac index 64fc0b1..dc3a947 100644 --- a/configure.ac +++ b/configure.ac @@ -41,9 +41,12 @@ AC_ARG_ENABLE(xprint, AM_CONDITIONAL(USE_XPRINT, test x$enable_xprint = xyes) if test x$enable_xprint = xyes; then PKG_CHECK_MODULES(PKGDEPS, xprintutil xp xaw8) + print_noprint=xprint else PKG_CHECK_MODULES(PKGDEPS, xaw7) + print_noprint=noxprint fi +AC_CONFIG_LINKS([app-defaults/Xedit:app-defaults/Xedit-$print_noprint]) AC_ARG_WITH(lispdir, AS_HELP_STRING([--with-lispdir=PATH], [Directory to install lisp files (default: $libdir/X11/xedit/lisp)]), |