nautilus-python r57 - in trunk: . examples src

[gpoo svn gnome org]

Author: gpoo
Date: Mon Jun  9 21:24:25 2008
New Revision: 57
URL: http://svn.gnome.org/viewvc/nautilus-python?rev=57&view=rev

Log:
2008-06-09  German Poo-Caaman~o  <gpoo gnome org>

    * config.h.in
    * configure.in
    * examples/README.in
    * nautilus-python.pc.in
    * nautilus-python.spec.in
    * src/nautilus-python.c:
    Fixed hardcoded path for Nautilus extension. 
    Fixed #527604 (Kjell Braden).



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/examples/README.in
   trunk/nautilus-python.pc.in
   trunk/nautilus-python.spec.in
   trunk/src/nautilus-python.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun  9 21:24:25 2008
@@ -60,6 +60,7 @@
 dnl ---------------------------------
 NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
 AC_SUBST(NAUTILUS_EXTENSION_DIR)
+AC_DEFINE_UNQUOTED(NAUTILUS_EXTENSION_DIR, "$NAUTILUS_EXTENSION_DIR", [Nautilus' extensions directory])
 
 AC_OUTPUT([
   Makefile 

Modified: trunk/examples/README.in
==============================================================================
--- trunk/examples/README.in	(original)
+++ trunk/examples/README.in	Mon Jun  9 21:24:25 2008
@@ -1,6 +1,6 @@
 To try any of the examples, copy them over to:
 
-    @NAUTILUS_LIBDIR@/nautilus/extensions-1.0/python/
+    @NAUTILUS_EXTENSION_DIR@/python/
 or:
     ~/.nautilus/python-extensions/
 

Modified: trunk/nautilus-python.pc.in
==============================================================================
--- trunk/nautilus-python.pc.in	(original)
+++ trunk/nautilus-python.pc.in	Mon Jun  9 21:24:25 2008
@@ -4,4 +4,4 @@
 
 prefix= prefix@
 libdir=${prefix}/lib
-pythondir= NAUTILUS_LIBDIR@/nautilus/extensions-1.0/python
+pythondir= NAUTILUS_EXTENSION_DIR@/python

Modified: trunk/nautilus-python.spec.in
==============================================================================
--- trunk/nautilus-python.spec.in	(original)
+++ trunk/nautilus-python.spec.in	Mon Jun  9 21:24:25 2008
@@ -45,7 +45,7 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog NEWS
 %{_libdir}/nautilus-python
-%{_libdir}/nautilus/extensions-1.0
+ NAUTILUS_EXTENSION_DIR@
 %{_libdir}/pkgconfig/nautilus-python.pc
 
 %changelog

Modified: trunk/src/nautilus-python.c
==============================================================================
--- trunk/src/nautilus-python.c	(original)
+++ trunk/src/nautilus-python.c	Mon Jun  9 21:24:25 2008
@@ -332,7 +332,7 @@
 
 	all_types = g_array_new(FALSE, FALSE, sizeof(GType));
 
-	nautilus_python_load_dir(module, NAUTILUS_LIBDIR "/nautilus/extensions-1.0/python");
+	nautilus_python_load_dir(module, NAUTILUS_EXTENSION_DIR "/python");
 	user_extensions_dir = g_strdup_printf("%s/.nautilus/python-extensions/",
 										  g_get_home_dir());
 	nautilus_python_load_dir(module, user_extensions_dir);