summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-12-07 16:18:01 +0000
committerKevin E Martin <kem@kem.org>2005-12-07 16:18:01 +0000
commit898dc25befe1d90e36e3735b011039745176e861 (patch)
tree3f9fcba882a5f5dd94de0df7fcc17ee553821238
parent60093efc850bea280c2931f81b90ee8d83a21df6 (diff)
Change to use the app-defaults default dir configured in libXt.
-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 1d74c8e..c128884 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 2279a33..0497064 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ dist_data_DATA = xman.help
# App default files (*.ad)
-appdefaultdir = $(libdir)/X11/app-defaults
+appdefaultdir = @appdefaultdir@
if XAW_USE_XPRINT
Xman: Xman-xprint.ad
diff --git a/configure.ac b/configure.ac
index 0dd614a..ed1b831 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,10 @@ fi
AC_SUBST(XMAN_CFLAGS)
AC_SUBST(XMAN_LIBS)
+PKG_CHECK_MODULES(APPDEFS, xt)
+appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_SUBST(appdefaultdir)
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION