diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:59 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:59 +0000 |
| commit | e70ce0696695b7e6d627d046c19c3b6c9a8ce3da (patch) | |
| tree | 71a49319feda2efd96690491a0b7bfcdaec03a78 | |
| parent | 6090b669a399c4663517b845d76945c6c2f97ef9 (diff) | |
Change to use the app-defaults default dir configured in libXt.MODULAR_COPY
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Change to use the app-defaults default dir configured in libXt. + 2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> * Makefile.am: diff --git a/Makefile.am b/Makefile.am index ce92387..4f4c8a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,7 @@ SUFFIXES = .ad .ad: cp $< $@ -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ appdefault_DATA = $(APPDEFAULTFILES) CLEANFILES = $(APPDEFAULTFILES) Xedit.ad @@ -186,7 +186,7 @@ EXTRA_DIST = \ lisp/TODO \ lisp/compile.c \ lisp/env.c \ - lisp/mathimp.c \ + lisp/mathimp.c \ lisp/modules/psql.c \ lisp/modules/x11.c \ lisp/modules/xaw.c \ diff --git a/configure.ac b/configure.ac index 1c6cf10..675ac5d 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,10 @@ fi AC_SUBST(XEDIT_CFLAGS) AC_SUBST(XEDIT_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |