diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:58 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:58 +0000 |
| commit | d1ae6091d49c8af843e6895cb438225078a0f797 (patch) | |
| tree | 66a7ab6fff8cd4c4ca3eae70b71d673da630a247 | |
| parent | 07cfe6f6de483aefcc18836fd3f03bdc5d6cd823 (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 cc3cb1d..99da22e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,7 +63,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ Bitmap-color \ diff --git a/configure.ac b/configure.ac index 0ed753b..585ed9e 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,10 @@ AC_SUBST(BITMAP_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |