diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:00 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:00 +0000 |
| commit | 93d83b89292b73fa6d1a48064e4730f43a6fce3e (patch) | |
| tree | f904c7f8106b13d39ec18748937678fa89d2df33 | |
| parent | ade038820780c806a8f43fadf2f9c9f4df50478d (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 25157c6..cc7b451 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ appman_PRE = \ # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = \ diff --git a/configure.ac b/configure.ac index db27f63..24dfc5a 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,10 @@ XAW_CHECK_XPRINT_SUPPORT(XLOAD) AC_SUBST(XLOAD_CFLAGS) AC_SUBST(XLOAD_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |