diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:59 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:17:59 +0000 |
| commit | 1e549821dd9fbb322dc9b620f65fa15bd4991279 (patch) | |
| tree | 3a4d004350d83dc87963036a5f9956de5c4cd525 | |
| parent | eaa39449a305ef83612f35efa2028aa457666d5a (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 | 3 |
3 files changed, 10 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 c9a58d5..5d5977d 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 = \ Xfd diff --git a/configure.ac b/configure.ac index 5e8a964..bdc236c 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,9 @@ AC_SUBST(XFD_CFLAGS) AC_SUBST(XFD_LIBS) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |