diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:00 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:00 +0000 |
| commit | 61019bb2e2eea3f970540dc24d1bd52d508e5f60 (patch) | |
| tree | 30971fc5fa102dfe8a3ce6a44d350dbcffdf9ae5 | |
| parent | 95ba475220dafec7777d5e3802d817fb068a70ed (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 bbd1acb..b2a1bfd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index 1c2a3dc..245148a 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,10 @@ XAW_CHECK_XPRINT_SUPPORT(XMAG) AC_SUBST(XMAG_CFLAGS) AC_SUBST(XMAG_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |