diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-12 20:33:01 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-12 20:33:01 -0200 |
| commit | bb19bb3d1dd5bb9c0070f867324f740894c76887 (patch) | |
| tree | a4912225b7d9f1e5f3fc1a47e604ff25781f96dc | |
| parent | e7d66545e71cdd223761ce14416cbebccbd6dd75 (diff) | |
Correct problems in make distcheck.
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 12 insertions, 1 deletions
@@ -21,3 +21,8 @@ stamp-h1 xedit xedit.1 *~ +*.a +*.o +xedit-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 24aabef..ee22432 100644 --- a/Makefile.am +++ b/Makefile.am @@ -163,6 +163,8 @@ lisp_re_tests_SOURCES = lisp/re/tests.c # App default files +DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults + appdefaultdir = @appdefaultdir@ appdefault_DATA = \ app-defaults/Xedit-color \ diff --git a/configure.ac b/configure.ac index cd74d5e..b756fde 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,11 @@ AC_SUBST(PKGDEPS_CFLAGS) AC_SUBST(PKGDEPS_LIBS) 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) XORG_MANPAGE_SECTIONS |