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 | 7dfe2ee4c0312d7ca924d77c09098ca5b4948b3b (patch) | |
tree | aefd5785744b048ca12ccd85ea4c57287f2d1742 | |
parent | 66a5572e4d49de7366d9cb6586cfdb4a41e6aa6a (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 49a6a8c..d57f012 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ Xditview \ diff --git a/configure.ac b/configure.ac index e193bf5..07b5bb2 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,10 @@ XAW_CHECK_XPRINT_SUPPORT(XDITVIEW) AC_SUBST(XDITVIEW_CFLAGS) AC_SUBST(XDITVIEW_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |