diff options
author | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:02 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2005-12-07 16:18:02 +0000 |
commit | 1943921e9ccf275b582776dd735da4d4b8a401cd (patch) | |
tree | 3e2b5cd73abf1469e133ca47a2e654fbc58fea13 | |
parent | 8e5ab86825f40de99b9ebde1a8726a4ae988fc57 (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 fb58caf..241de9e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man # App default files (*.ad) -appdefaultdir = $(libdir)/X11/app-defaults +appdefaultdir = @appdefaultdir@ appdefault_DATA = Xvidtune diff --git a/configure.ac b/configure.ac index 2dbca64..5adbd56 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,10 @@ AC_ARG_WITH(vendor-name, [ VENDOR_NAME="The X.Org Foundation" ]) AC_SUBST([VENDOR_NAME]) +PKG_CHECK_MODULES(APPDEFS, xt) +appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_SUBST(appdefaultdir) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION |