[brasero] Make distcheck work by adding --with-nautilusdir for the installation path of the nautilus extension
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [brasero] Make distcheck work by adding --with-nautilusdir for the installation path of the nautilus extension
- Date: Thu, 27 Aug 2009 15:10:30 +0000 (UTC)
commit c957f917739e8fed66968916bbe9316a58afd1bf
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Thu Aug 27 17:06:50 2009 +0200
Make distcheck work by adding --with-nautilusdir for the installation path of the nautilus extension
Makefile.am | 5 +++--
configure.in | 15 +++++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4ffbca5..b73f83d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,10 @@ EXTRA_DIST = \
noinst_PROGRAMS =
-DIST_CHECK_CONFIGRE_FLAGS = \
+DISTCHECK_CONFIGURE_FLAGS = \
--disable-scrollkeeper \
- --enable-gtk-doc
+ --enable-gtk-doc \
+ --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck'
DISTCLEANFILES = \
intltool-extract \
diff --git a/configure.in b/configure.in
index b95f58a..de888ef 100644
--- a/configure.in
+++ b/configure.in
@@ -222,6 +222,11 @@ AC_ARG_ENABLE(nautilus,
[enable_nautilus=$enableval],
[enable_nautilus="yes"])
+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 x"$enable_nautilus" = "xyes"; then
PKG_CHECK_MODULES(NAUTILUS_EXTENSION,
libnautilus-extension >= $NAUTILUS_REQUIRED,
@@ -234,8 +239,14 @@ fi
if test x"$build_nautilus" = "xyes"; then
NAUTILUS_EXTENSION_CFLAGS="$BRASERO_GLIB_CFLAGS $BRASERO_UI_CFLAGS $NAUTILUS_EXTENSION_CFLAGS"
NAUTILUS_EXTENSION_LIBS="$BRASERO_GLIB_LIBS $BRASERO_UI_LIBS $NAUTILUS_EXTENSION_LIBS"
- NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
- AC_SUBST(NAUTILUSDIR)
+
+ if test "${ac_with_nautilusdir}" = ""; then
+ ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+ fi
+
+ AC_MSG_NOTICE([installing plugin in ${ac_with_nautilusdir}])
+ AC_SUBST([NAUTILUSDIR],[${ac_with_nautilusdir}])
+
AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]