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 | d235b45cc12cbf9c04cf79e525033a3b0205c53d (patch) | |
| tree | d808d5f5867caddef1cbfd5df518b16becf5dd71 | |
| parent | 15308d1a18f86d783b2480b31ce168de3f9ca109 (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 ffe8f28..e3bbe50 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index 5d4d637..076b3c9 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,10 @@ XAW_CHECK_XPRINT_SUPPORT(XFONTSEL) AC_SUBST(XFONTSEL_CFLAGS) AC_SUBST(XFONTSEL_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |