[Monodevelop-patches-list] r1061 - in branches/MonoDevelop-playground: . gdldock/sources/gdl

[commit-watcher at mono-cvs.ximian.com]

Author: jzwart
Date: 2004-02-29 05:02:53 -0500 (Sun, 29 Feb 2004)
New Revision: 1061

Modified:
   branches/MonoDevelop-playground/configure.in
   branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am
   branches/MonoDevelop-playground/gdldock/sources/gdl/gdl-stock.c
Log:
Install the stock images for the dock in $prefix/monodevelop/images instead of
$prefix/lib/monodevelop/bin.


Modified: branches/MonoDevelop-playground/configure.in
===================================================================
--- branches/MonoDevelop-playground/configure.in	2004-02-29 09:47:46 UTC (rev 1060)
+++ branches/MonoDevelop-playground/configure.in	2004-02-29 10:02:53 UTC (rev 1061)
@@ -76,6 +76,8 @@
 monodevelop_ui_dir="${packageprefix}/share/monodevelop/ui"
 AC_SUBST(monodevelop_ui_dir)
 
+monodevelop_images_dir="${packageprefix}/share/monodevelop/images"
+AC_SUBST(monodevelop_images_dir)
 
 AC_OUTPUT([
 Makefile

Modified: branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am
===================================================================
--- branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am	2004-02-29 09:47:46 UTC (rev 1060)
+++ branches/MonoDevelop-playground/gdldock/sources/gdl/Makefile.am	2004-02-29 10:02:53 UTC (rev 1061)
@@ -12,6 +12,7 @@
 
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"GdlDock\" -I..	-I. \
+	-DGDL_IMAGESDIR=\""$(monodevelop_images_dir)"\"	\
 	$(GDL_DEPENDENCIES_CFLAGS)
 
 libgdldock_headers = \
@@ -114,8 +115,13 @@
 	&& rm -f xgen-gmc
 
 gdldocklibdir = $(prefix)/lib/
-gdldocklib_DATA = libgdldock.so stock-close-12.png \
-	stock-menu-left-12.png stock-menu-right-12.png
+gdldocklib_DATA = libgdldock.so
+	
+gdldockimagesdir = $(prefix)/share/monodevelop/images
+gdldockimages_DATA =  \
+	stock-close-12.png \
+	stock-menu-left-12.png \
+	stock-menu-right-12.png
 
 clean:
 	rm -f libgdldock.so $(libgdldock_OBJECTS) $(GENERATED_SOURCE)

Modified: branches/MonoDevelop-playground/gdldock/sources/gdl/gdl-stock.c
===================================================================
--- branches/MonoDevelop-playground/gdldock/sources/gdl/gdl-stock.c	2004-02-29 09:47:46 UTC (rev 1060)
+++ branches/MonoDevelop-playground/gdldock/sources/gdl/gdl-stock.c	2004-02-29 10:02:53 UTC (rev 1061)
@@ -26,8 +26,6 @@
 #include <gtk/gtkiconfactory.h>
 #include "gdl-stock.h"
 
-#define GDL_IMAGESDIR "."
-
 static GtkIconFactory *gdl_stock_factory = NULL;
 
 static struct {