[Goodies-commits] r2495 - in thunar-thumbnailers/trunk: . mime

[Erlend Davidson]

Author: erland
Date: 2007-02-18 14:32:19 +0000 (Sun, 18 Feb 2007)
New Revision: 2495

Modified:
   thunar-thumbnailers/trunk/ChangeLog
   thunar-thumbnailers/trunk/configure.in.in
   thunar-thumbnailers/trunk/mime/Makefile.am
Log:
Added an option --disable-update-mime-database to configure to make life easier for packagers

Modified: thunar-thumbnailers/trunk/ChangeLog
===================================================================
--- thunar-thumbnailers/trunk/ChangeLog	2007-02-14 11:55:41 UTC (rev 2494)
+++ thunar-thumbnailers/trunk/ChangeLog	2007-02-18 14:32:19 UTC (rev 2495)
@@ -1,3 +1,7 @@
+2207-02-18	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
+
+	* Added an option --disable-update-mime-database to configure to make life easier for packagers
+
 2007-02-03	Erlend Davidson <E.R.M.Davidson at sms.ed.ac.uk>
 
 	* Added a .agr (xmgrace) thumbnailer (agr-thumbnailer)

Modified: thunar-thumbnailers/trunk/configure.in.in
===================================================================
--- thunar-thumbnailers/trunk/configure.in.in	2007-02-14 11:55:41 UTC (rev 2494)
+++ thunar-thumbnailers/trunk/configure.in.in	2007-02-18 14:32:19 UTC (rev 2495)
@@ -83,7 +83,13 @@
 fi
 AM_CONDITIONAL(ENABLE_GRACE, test "$enable_grace" = "yes")
 
+dnl *** check if we want to run update-mime-database on installed mimetypes ***
+AC_ARG_ENABLE(disable-update-mime-database,
+   [ --disable-update-mime-database Still installs the mimetypes, but doesn't run update-mime-database. ],
+   disable-update-mime-database=yes)
+AM_CONDITIONAL(DISABLE_UPDATE_MIME_DATABASE, test "$disable_update_mime_database" = "yes")
 
+
 AC_OUTPUT([
 Makefile
 eps-thumbnailer/Makefile

Modified: thunar-thumbnailers/trunk/mime/Makefile.am
===================================================================
--- thunar-thumbnailers/trunk/mime/Makefile.am	2007-02-14 11:55:41 UTC (rev 2494)
+++ thunar-thumbnailers/trunk/mime/Makefile.am	2007-02-18 14:32:19 UTC (rev 2495)
@@ -7,5 +7,7 @@
 EXTRA_DIST =								\
 	$(mimepack_DATA)
 
-install-data-local:
-	update-mime-database $(mimedir)
\ No newline at end of file
+if !DISABLE_UPDATE_MIME_DATABASE
+    install-data-local:
+	    update-mime-database $(mimedir)
+endif