summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-07 16:17:58 +0000
committerKevin E Martin <kem@kem.org>2005-12-07 16:17:58 +0000
commit01110cd495dc25e40e99dac70e104e97bfa88ec1 (patch)
tree3c70318c82b629466d36fbe367d4b6e602340557
parentde145e0469b263c12499fb6827e8ca7290b9e174 (diff)
Change to use the app-defaults default dir configured in libXt.MODULAR_COPY
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f05d50a..7492ea6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 d48685f..f95d394 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ appman_PRE = \
# App default files (*.ad)
-appdefaultdir = $(libdir)/X11/app-defaults
+appdefaultdir = @appdefaultdir@
APPDEFAULTFILES = \
diff --git a/configure.ac b/configure.ac
index 0bcdde0..1204d70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,10 @@ PKG_CHECK_MODULES(OCLOCK, x11 xmu xext)
AC_SUBST(OCLOCK_CFLAGS)
AC_SUBST(OCLOCK_LIBS)
+PKG_CHECK_MODULES(APPDEFS, xt)
+appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_SUBST(appdefaultdir)
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION