diff options
| author | infirit <[email protected]> | 2013-10-18 17:51:25 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-12-16 15:31:11 +0100 |
| commit | f29a02cc3c8cbb50d0e4f1a5220fef27dce9e9ca (patch) | |
| tree | 571e8761bed2d20b8f4214de15dd67639b2b4312 | |
| parent | 03788c619866113f57f5dd4117b8e721153d3b92 (diff) | |
| download | engrampa-f29a02cc3c8cbb50d0e4f1a5220fef27dce9e9ca.tar.bz2 engrampa-f29a02cc3c8cbb50d0e4f1a5220fef27dce9e9ca.tar.xz | |
Fix distcheck so it can run without root privilage
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 413f9e0..0de02b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,8 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper +DISTCHECK_CONFIGURE_FLAGS = --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' + MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ diff --git a/configure.ac b/configure.ac index 2d37e2c..4560d48 100644 --- a/configure.ac +++ b/configure.ac @@ -151,8 +151,17 @@ AC_SUBST(DISABLE_DEPRECATED) dnl ****************************** -CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension` -AC_SUBST(CAJA_EXTENSION_DIR) +AC_ARG_WITH(cajadir, + AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]), + [ac_with_cajadir=$withval], + [ac_with_cajadir=""]) +if test "${ac_with_cajadir}" = ""; then + ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension` +fi + +AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}]) +AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}]) + dnl ****************************** |