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 | 9d2ba2917eea02a77d1e50d74f7449166067d7dd (patch) | |
tree | 3a9613986162de3d60b497afe56dd5583954a5ef | |
parent | 2b26c5434f06ee68349b41f332ff46b21bafd557 (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 241c4db..30b732d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index 55c32fc..b4c8f71 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,10 @@ fi AC_SUBST(XCLOCK_CFLAGS) AC_SUBST(XCLOCK_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |