diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:01 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:01 +0000 |
| commit | 436bf72ac6491cd999eef34686a105cc3009aa03 (patch) | |
| tree | 60bc6bb29b612822a1501b7e19eb19979b4adbff | |
| parent | 5c26c0c24b419e91e2d0ee33659f24bcde8f5fe0 (diff) | |
Change to use the app-defaults default dir configured in libXt.MODULAR_COPY
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 11 insertions, 1 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 54cf259..bad4d3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,7 +68,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index e23121a..239966d 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,10 @@ XAW_CHECK_XPRINT_SUPPORT(XSM) AC_SUBST(XSM_CFLAGS) AC_SUBST(XSM_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |