[Monodevelop-patches-list] r1220 - trunk/MonoDevelop

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

Author: jluke
Date: 2004-03-21 16:27:11 -0500 (Sun, 21 Mar 2004)
New Revision: 1220

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
+       * Makefile.am: support GNOME2.6 and fd.o way of mimetypes
+       and make it conditional on if update-mime-databade is installed
+       * monodevelop.xml: new mime file



Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-03-21 21:16:48 UTC (rev 1219)
+++ trunk/MonoDevelop/ChangeLog	2004-03-21 21:27:11 UTC (rev 1220)
@@ -2,6 +2,9 @@
 
 	* docs/WritingAddins.html: initial addin quick guide
 	* configure.in: Gtk# 0.18 is actually required
+	* Makefile.am: support GNOME2.6 and fd.o way of mimetypes
+	and make it conditional on if update-mime-databade is installed
+	* monodevelop.xml: new mime file
 
 2004-03-21	John BouAntoun  <jba-mono at optusnet.com.au>
 

Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am	2004-03-21 21:16:48 UTC (rev 1219)
+++ trunk/MonoDevelop/Makefile.am	2004-03-21 21:27:11 UTC (rev 1220)
@@ -14,12 +14,28 @@
 pixmapdir = $(gnome_data)/pixmaps
 pixmap_DATA = monodevelop.png
 
+if ENABLE_XDGMIME
+
+# need to respect $XDG_DATA_DIR probably
+xdgmimedir = $(gnome_data)/mime/packages
+xdgmime_DATA = monodevelop.xml
+
+install-data-hook:
+	update-mime-database $(gnome_data)/mime
+
+uninstall-hook:
+	update-mime-database $(gnome_data)/mime
+
+else
+
 mimeinfodir = $(gnome_data)/mime-info
 mimeinfo_DATA = monodevelop.mime monodevelop.keys
 
 applicationdir = $(gnome_data)/application-registry
 application_DATA = monodevelop.applications
 
+endif
+
 run: runmd
 
 runmd: $(PROGRAM)
@@ -37,5 +53,5 @@
 	cd build/bin && mono -O=inline --profile MonoPad.exe
 
 EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) \
-	$(mimeinfo_DATA) $(pixmap_DATA) $(application_DATA) KNOWN_ISSUES
+	$(mimeinfo_DATA) $(pixmap_DATA) $(application_DATA) $(xdgmime_DATA)
 

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2004-03-21 21:16:48 UTC (rev 1219)
+++ trunk/MonoDevelop/configure.in	2004-03-21 21:27:11 UTC (rev 1220)
@@ -8,6 +8,7 @@
 
 AC_PATH_PROG(MONO, mono)
 AC_PATH_PROG(MCS, mcs)
+AC_PATH_PROG(XDGMIME, update-mime-database, no)
 if test "x$MONO" = "x" ; then
   AC_MSG_ERROR([Can't find "mono" in your PATH])
 fi
@@ -94,6 +95,7 @@
 AC_SUBST(gnome_prefix)
 
 AM_CONDITIONAL(ENABLE_DEBUGGER, test "x$enable_debugger" = "xyes")
+AM_CONDITIONAL(ENABLE_XDGMIME, test "x$XDGMIME")
 
 AC_OUTPUT([
 Makefile