gnome-mount r170 - in trunk: . src
- From: davidz svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-mount r170 - in trunk: . src
- Date: Thu, 17 Apr 2008 04:46:54 +0100 (BST)
Author: davidz
Date: Thu Apr 17 04:46:53 2008
New Revision: 170
URL: http://svn.gnome.org/viewvc/gnome-mount?rev=170&view=rev
Log:
2008-04-16 David Zeuthen <davidz redhat com>
Patch from Michael Biebl <mbiebl gmail com>.
* configure.in:
* src/Makefile.am:
I was wondering, why the nautilus extension directory is hardcoded
like. Maybe you consider something like the attached patch which
uses pkg-config --variable extensiondir libnautilus-extension and
falls back to $(libdir)/nautilus/extensions-2.0.
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/src/Makefile.am
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Apr 17 04:46:53 2008
@@ -78,6 +78,11 @@
if test "x$enable_nautilus_extension" = "xyes"; then
AC_DEFINE([ENABLE_NAUTILUS_EXTENSION],[],[Enable Nautilus Extension])
AC_MSG_RESULT(yes)
+ nautilus_extensiondir="`pkg-config --variable extensiondir libnautilus-extension`"
+ if test "x$nautilus_extensiondir" = "x"; then
+ nautilus_extensiondir="\$(libdir)/nautilus/extensions-2.0"
+ fi
+ AC_SUBST(nautilus_extensiondir)
else
AC_MSG_RESULT(no)
fi
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Apr 17 04:46:53 2008
@@ -27,8 +27,6 @@
gnome-mount-properties-view.c gnome-mount-properties-view.h
if ENABLE_NAUTILUS_EXTENSION
-nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
-
nautilus_extension_LTLIBRARIES=libgnome-mount.la
libgnome_mount_la_LDFLAGS = -module -avoid-version
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]