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 | ff03086d9069fcd5f2b952709737dae7d51d80ef (patch) | |
| tree | a12b8f4588d5ca31e4f01b76836e47fb6d44e3fa | |
| parent | c3dddcf94c8ec3c4d483e1d568ea8fb69aa468a0 (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 1fafc8a..6c2b150 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index 638eada..b4cb9b8 100644 --- a/configure.ac +++ b/configure.ac @@ -36,6 +36,10 @@ XAW_CHECK_XPRINT_SUPPORT(XMESSAGE) AC_SUBST(XMESSAGE_CFLAGS) AC_SUBST(XMESSAGE_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |