Author: Konstantin Dmitriev <[email protected]>
Date: Wed May 4 13:59:41 2011 +0700
Install freedesktop.org mime info.
---
synfig-studio/Makefile.am | 19 +++++++++++++++++--
synfig-studio/TODO | 1 -
synfig-studio/configure.ac | 8 ++++++++
synfig-studio/synfigstudio.xml.in | 9 ++++++---
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/synfig-studio/Makefile.am b/synfig-studio/Makefile.am
index ad60c25..2bed470 100644
--- a/synfig-studio/Makefile.am
+++ b/synfig-studio/Makefile.am
@@ -48,19 +48,24 @@ EXTRA_DIST = \
synfigstudio-thumbnailer.schemas.in
+DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb
+
# Desktop entry
desktopdir = $(prefix)/share/applications
desktop_DATA = synfigstudio.desktop
# @INTLTOOL_DESKTOP_RULE@
-mimedir = $(prefix)/share/mime-info
-mime_DATA = synfigstudio.keys synfigstudio.mime
+mimeinfodir = $(prefix)/share/mime-info
+mimeinfo_DATA = synfigstudio.keys synfigstudio.mime
# Icon
icondir = $(datadir)/pixmaps
icon_DATA = images/synfig_icon.png images/sif_icon.png
+mimedir = $(prefix)/share/mime/packages
+mime_DATA = synfigstudio.xml
+
ACLOCAL_AMFLAGS=-I m4
GREP=grep
@@ -127,6 +132,16 @@ package: package-osx
endif
endif
+install-data-hook:
+if ENABLE_UPDATE_MIMEDB
+ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+endif
+
+uninstall-hook:
+if ENABLE_UPDATE_MIMEDB
+ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+endif
+
html: .doc_stamp
rtf: .doc_stamp
diff --git a/synfig-studio/TODO b/synfig-studio/TODO
index 0e822d2..57648e1 100644
--- a/synfig-studio/TODO
+++ b/synfig-studio/TODO
@@ -1,6 +1,5 @@
## FIXMEs ##
-* Install freedesktop.org mime info
* Install gnome thumbnailer
## General ##
diff --git a/synfig-studio/configure.ac b/synfig-studio/configure.ac
index 535161c..f86cda9 100755
--- a/synfig-studio/configure.ac
+++ b/synfig-studio/configure.ac
@@ -87,6 +87,7 @@ case "$host" in
AM_CONDITIONAL(MACOSX_PKG, false)
;;
esac
+
# -- L I B R A R I E S ----------------------------------------
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[
@@ -266,6 +267,13 @@ AC_SUBST(imageext)
imagedir="${datadir}/pixmaps/synfigstudio"
AC_SUBST(imagedir)
+AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
+AC_ARG_ENABLE(update-mimedb,
+ AC_HELP_STRING([--disable-update-mimedb],
+ [disable the update-mime-database after install
[default=no]]),,
+ enable_update_mimedb=yes)
+AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
+
AC_CONFIG_FILES([Makefile
build_tools/Makefile
doxygen.cfg
diff --git a/synfig-studio/synfigstudio.xml.in
b/synfig-studio/synfigstudio.xml.in
index 8c2424c..65f0061 100644
--- a/synfig-studio/synfigstudio.xml.in
+++ b/synfig-studio/synfigstudio.xml.in
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info";>
- <mime-type type="image/sif"><comment>Synfig Animation File</comment>
- <glob pattern="*.sif"/></mime-type>
-</mime-info>
\ No newline at end of file
+ <mime-type type="image/sif">
+ <comment>Synfig Animation File</comment>
+ <glob pattern="*.sif"/>
+ <glob pattern="*.sifz"/>
+ </mime-type>
+</mime-info>
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
