diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-19 04:51:00 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-19 04:51:00 -0700 |
| commit | 040aec00a2422b276eed5836a138d8a0231b2611 (patch) | |
| tree | 86b569c3484db784fb00a454451b490ca5a8e3cc | |
| parent | 63a43cfd77e7d8677bab2dbd3323bf0f3c7f51e0 (diff) | |
| parent | 8d268d4f7dbdfb66b66880ea4cdf81a756396bf4 (diff) | |
| download | engrampa-040aec00a2422b276eed5836a138d8a0231b2611.tar.bz2 engrampa-040aec00a2422b276eed5836a138d8a0231b2611.tar.xz | |
Merge pull request #32 from infirit/master
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 514a751..40554c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,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 b41ea5d..22e7a89 100644 --- a/configure.ac +++ b/configure.ac @@ -170,8 +170,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 ****************************** |