[gnome-main-menu] [build] Install nautilus extension in the right directory

[Vincent Untz <vuntz src gnome org>]

commit 819cc31c2db7a3cd42bf64654d1526a21902dea1
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Mar 24 17:21:51 2010 +0100

    [build] Install nautilus extension in the right directory
    
    We used to install in /usr/lib/nautilus/extensions-1.0 instead of
    checking in the libnautilus-extension pkg-config file where we should
    install it.

 configure.in                   |    2 ++
 nautilus-main-menu/Makefile.am |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 9dcf4f7..a6ad135 100644
--- a/configure.in
+++ b/configure.in
@@ -150,9 +150,11 @@ then
 	NAUTILUS_REQUIRED=2.6.0
 
 	PKG_CHECK_MODULES(NAUTILUS, [libnautilus-extension >= $NAUTILUS_REQUIRED glib-2.0 gobject-2.0 gconf-2.0])
+	NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
 
 	AC_SUBST(NAUTILUS_CFLAGS)
 	AC_SUBST(NAUTILUS_LIBS)
+	AC_SUBST(NAUTILUSDIR)
 fi
 
 AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test "x$ENABLE_NAUTILUS_EXTENSION" = "x1")
diff --git a/nautilus-main-menu/Makefile.am b/nautilus-main-menu/Makefile.am
index 953bf21..7b85981 100644
--- a/nautilus-main-menu/Makefile.am
+++ b/nautilus-main-menu/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES =						\
 	$(NAUTILUS_CFLAGS)				\
 	$(WARN_CFLAGS)
 
-# FIXME: get this from the .pc file
-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir= NAUTILUSDIR@
 
 nautilus_extension_LTLIBRARIES=libnautilus-main-menu.la
 
@@ -20,4 +19,4 @@ libnautilus_main_menu_la_LDFLAGS = -module -avoid-version
 libnautilus_main_menu_la_LIBADD  = $(NAUTILUS_LIBS) $(GNOMEVFS_LIBS) $(GCONF_LIBS) $(GNOMEDESKTOP_LIBS)
 
 AM_CPPFLAGS =							\
-	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
\ No newline at end of file
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"