diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-03-08 06:40:14 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-03-23 12:43:59 +0100 |
| commit | c2de936fe580d82da3c5b3590a1acb9e28ec68c1 (patch) | |
| tree | 91bedae2067458c1f6c53435a7cbce109b83e71e | |
| parent | f2f2eed7c284ced3ddc3fe3451ec7a8af9dfdbb4 (diff) | |
Fix installation of app-defaults
Add a configure option for appdefaultdir, and use it for
make distcheck, because it wants everything under $prefix.
By default, still use `pkg-config --variable=appdefaultdir xt'.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index dacdefd..dee897d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,7 +151,9 @@ chooser_SOURCES = \ # App default files (*.ad) -appdefaultdir = @DESTDIR@@appdefaultdir@ +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults + +appdefaultdir = @appdefaultdir@ APPDEFAULTFILES = Chooser diff --git a/configure.ac b/configure.ac index 3cd11be..1110525 100644 --- a/configure.ac +++ b/configure.ac @@ -518,8 +518,13 @@ AC_DEFINE_DIR(DEF_GREETER_LIB, XDMLIBDIR/libXdmGreet.so, [Define to pathname where greeter shared object is installed (if used)]) PKG_CHECK_MODULES(APPDEFS, xt) -appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt) +AC_ARG_WITH(appdefaultdir, + AC_HELP_STRING([--with-appdefaultdir=<pathname>], + [specify directory for app-defaults files (default is autodetected)]), + [appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"]) AC_SUBST(appdefaultdir) + AC_SUBST(MKTEMP_COMMAND) XORG_WITH_LINT |