[nautilus-image-converter] Fix distcheck so it works without root privilege
- From: Brian Pepple <bpepple src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-image-converter] Fix distcheck so it works without root privilege
- Date: Fri, 15 Apr 2011 23:58:58 +0000 (UTC)
commit 2eeccb374defee14389b26c2f0e9dbd15449a297
Author: Brian Pepple <bpepple fedoraproject org>
Date: Tue Feb 8 19:36:28 2011 -0500
Fix distcheck so it works without root privilege
Makefile.am | 2 ++
configure.ac | 12 ++++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1a76506..5481b8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
SUBDIRS = data src po
+DISTCHECK_CONFIGURE_FLAGS = --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
+
INTLTOOL = \
intltool-extract.in \
intltool-merge.in \
diff --git a/configure.ac b/configure.ac
index 781c218..95004d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,16 @@ AC_SUBST(NAUTILUS_LIBS)
dnl -----------------------------------------------------------
dnl Use correct nautilus extensions directory
dnl -----------------------------------------------------------
-NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
+AC_ARG_WITH(nautilusdir,
+ AS_HELP_STRING([--with-nautilusdir=DIR],[Installation path for Nautilus extension @<:@auto@:>@]),
+ [ac_with_nautilusdir=$withval],
+ [ac_with_nautilusdir=""])
+if test "${ac_with_nautilusdir}" = ""; then
+ ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+fi
+
+AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}])
+AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}])
AC_CONFIG_FILES([
Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]