diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:57 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:57 +0000 |
| commit | f6cbfad7b7598895413a0c3b23e07940c0c5f776 (patch) | |
| tree | 6060e1ebd67a2ef99258a4eb78f9b417036a826b | |
| parent | 1fde86615a00efff3145097740f0460871802637 (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 023435d..c281b39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ EXTRA_DIST = \ Beforelight.ad diff --git a/configure.ac b/configure.ac index 0050495..144b990 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,10 @@ PKG_CHECK_MODULES(BEFORELIGHT, x11 xscrnsaver xt xaw7) AC_SUBST(BEFORELIGHT_CFLAGS) AC_SUBST(BEFORELIGHT_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |