diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:01 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:01 +0000 |
| commit | 94c9195eb246474480643c62dd4c5e9e3d610a39 (patch) | |
| tree | b373e9b8f558369f5404f9fd3ec834f8d5411e40 | |
| parent | f427001cd1f3efdafa06c381c38fd5a4449b76f2 (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 6c8184b..53c3ca6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index 2332c5b..a9a78ed 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,10 @@ fi AC_SUBST(XMORE_CFLAGS) AC_SUBST(XMORE_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |