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 | be590c64bc8df224154347ab5f6c32fe60bf0e67 (patch) | |
| tree | ce6170f5b1a445770b4ed4ffb777cd9aea4f8626 | |
| parent | 2ad19d20118c07d369ef67dd9ff8bd094d8e5864 (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 05bdfd5..bc8a796 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 = \ diff --git a/configure.ac b/configure.ac index 171f522..09fdf27 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,10 @@ XLOGO_LIBS="$XLOGO_LIBS $XEXT_LIBS" AC_SUBST(XLOGO_CFLAGS) AC_SUBST(XLOGO_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |