[f-spot: 6/8] latest patches so it builds and run

[Stephane Delcroix <sdelcroix src gnome org>]

commit 1d7b6804dd25e6bfae629c64196348fcc1908b09
Author: Stephane Delcroix <stephane delcroix org>
Date:   Tue May 26 13:01:58 2009 +0200

    latest patches so it builds and run
---
 extensions/Exporters/CDExport/Makefile.am        |    2 +-
 extensions/Exporters/PicasaWebExport/Makefile.am |    2 +-
 extensions/Exporters/ZipExport/Makefile.am       |    2 +-
 extensions/Tools/DevelopInUFraw/Makefile.am      |    2 +-
 extensions/Tools/RawPlusJpeg/Makefile.am         |    2 +-
 gtk-sharp-beans/Makefile.am                      |    2 +-
 src/f-spot.in                                    |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/Exporters/CDExport/Makefile.am b/extensions/Exporters/CDExport/Makefile.am
index 0ef69f9..b8ec614 100644
--- a/extensions/Exporters/CDExport/Makefile.am
+++ b/extensions/Exporters/CDExport/Makefile.am
@@ -19,7 +19,7 @@ REFS =					\
 PKGS =					\
 	-pkg:gnome-vfs-sharp-2.0	\
 	-pkg:gtk-sharp-2.0		\
-	-pkg:gio-sharp-2.0		\
+	$(LINK_GIOSHARP)		\
 	-pkg:glade-sharp-2.0
 
 RESOURCES =				\
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 25fa7f2..3b00484 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -21,7 +21,7 @@ REFS =					\
 
 PKGS =					\
 	-pkg:gnome-vfs-sharp-2.0	\
-	-pkg:gtk-sharp-beans-2.0	\
+	$(LINK_GTKSHARPBEANS)		\	
 	-pkg:gtk-sharp-2.0		\
 	-pkg:glade-sharp-2.0
 
diff --git a/extensions/Exporters/ZipExport/Makefile.am b/extensions/Exporters/ZipExport/Makefile.am
index eef5a35..bc06a44 100644
--- a/extensions/Exporters/ZipExport/Makefile.am
+++ b/extensions/Exporters/ZipExport/Makefile.am
@@ -22,7 +22,7 @@ REFS =					\
 PKGS =					\
 	-pkg:gnome-vfs-sharp-2.0	\
 	-pkg:gtk-sharp-2.0		\
-	-pkg:gio-sharp-2.0		\
+	$(LINK_GIOSHARP)		\
 	-pkg:glade-sharp-2.0
 
 RESOURCES =				\
diff --git a/extensions/Tools/DevelopInUFraw/Makefile.am b/extensions/Tools/DevelopInUFraw/Makefile.am
index e197821..6b4d378 100644
--- a/extensions/Tools/DevelopInUFraw/Makefile.am
+++ b/extensions/Tools/DevelopInUFraw/Makefile.am
@@ -20,7 +20,7 @@ REFS =					\
 
 PKGS =					\
 	-pkg:gnome-vfs-sharp-2.0	\
-	-pkg:gio-sharp-2.0		\
+	$(LINK_GIOSHARP)		\
 	-pkg:gtk-sharp-2.0
 
 RESOURCES =				\
diff --git a/extensions/Tools/RawPlusJpeg/Makefile.am b/extensions/Tools/RawPlusJpeg/Makefile.am
index 3e160e6..42c8c3d 100644
--- a/extensions/Tools/RawPlusJpeg/Makefile.am
+++ b/extensions/Tools/RawPlusJpeg/Makefile.am
@@ -19,7 +19,7 @@ REFS =					\
 	$(LINK_SEMWEB)
 
 PKGS =					\
-	-pkg:gio-sharp-2.0		\
+	$(LINK_GIOSHARP)		\
 	-pkg:gtk-sharp-2.0		\
 	-pkg:glade-sharp-2.0
 
diff --git a/gtk-sharp-beans/Makefile.am b/gtk-sharp-beans/Makefile.am
index a6ef612..620a3df 100644
--- a/gtk-sharp-beans/Makefile.am
+++ b/gtk-sharp-beans/Makefile.am
@@ -17,7 +17,7 @@ CUSTOMS =					\
 
 ASSEMBLIES =					\
 	-pkg:glib-sharp-2.0			\
-	-pkg:gio-sharp-2.0			\
+	$(LINK_GIOSHARP)			\
 	-pkg:gtk-sharp-2.0
 
 all: gtk-sharp-beans.dll
diff --git a/src/f-spot.in b/src/f-spot.in
index dbebc82..0717cf6 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -60,7 +60,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:../mono-addins/Mono.Addins:../mono-addins/Mono.Addins.Setup:../mono-addins/Mono.Addins.Gui:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:../mono-addins/Mono.Addins:../mono-addins/Mono.Addins.Setup:../mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done