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 | 62a334ff8c8ad8aac1800096a65885cadc0e4857 (patch) | |
tree | ffe5bb2f2438a4d7bd1836edfaaeb26fdfe4680d | |
parent | 676cb92b59b998681eec1f94e549b131357f5f4a (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 993178e..9d6b220 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,7 @@ gram.h: gram.c # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index 0bf5e4a..850f91f 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,10 @@ XAW_CHECK_XPRINT_SUPPORT(XGC) AC_SUBST(XGC_CFLAGS) AC_SUBST(XGC_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |