From: Alberto Ruiz Date: Fri, 8 Jul 2011 13:42:00 +0000 (+0100) Subject: [webp] Registering mime type for Linux X-Git-Tag: 0.7.1~199^2~8 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=831c5abfd9c455c67d2b4ddb00aa71e140cb3d4e [webp] Registering mime type for Linux --- diff --git a/Makefile.am b/Makefile.am index c3f5807..56c82b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,10 @@ libmoonshot/libmoonshot.lib: libmoonshot/libmoonshot.def endif +if OS_LINUX +mime_DATA = webprovisioning/moonshot.xml +mimedir = $(datadir)/mime/packages +endif if IPC_MSRPC @@ -149,6 +153,10 @@ tests_basic_SOURCES = tests/basic.c tests_basic_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS) tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la $(moonshot_LIBS) +if OS_LINUX +install-data-hook: + "${UPDATE_MIME_DATABASE}" $(datadir)/mime +endif if OS_WIN32 diff --git a/configure.ac b/configure.ac index 4300ded..f8efeee 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ case "$host" in ;; esac +AM_CONDITIONAL([OS_LINUX], [test "$win32" != "yes"]) AM_CONDITIONAL([OS_WIN32], [test "$win32" = "yes"]) AM_CONDITIONAL([IPC_MSRPC], [test "$SERVER_IPC_MODULE" = "msrpc-glib2-1.0"]) AM_CONDITIONAL([IPC_DBUS], [test "$SERVER_IPC_MODULE" = "dbus-glib-1"]) @@ -104,11 +105,21 @@ if test "$win32" = "yes"; then fi fi +if test "$win32" != "yes"; then + AC_PATH_PROG([UPDATE_MIME_DATABASE], [update-mime-database], [no]) + if test "$UPDATE_MIME_DATABASE" = "no"; then + AC_MSG_ERROR([ +*** Could not find the Freedesktop.org mime database update tool. +*** Web provisioning files could not be automatically installed.]) + fi +fi + AC_SUBST(MIDL) AC_SUBST(MSVC_LIB) AC_SUBST(IMAGEMAGICK_CONVERT) AC_SUBST(WIX_CANDLE) AC_SUBST(WIX_LIGHT) +AC_SUBST(UPDATE_MIME_DATABASE) # Dependencies PKG_CHECK_MODULES(moonshot,[ diff --git a/webprovisioning/moonshot.xml b/webprovisioning/moonshot.xml new file mode 100644 index 0000000..bd995d4 --- /dev/null +++ b/webprovisioning/moonshot.xml @@ -0,0 +1,11 @@ + + + + Moonshot Web Provisioning document + MSHT + + + + + + diff --git a/webprovisioning/sample.xml b/webprovisioning/sample.msht similarity index 100% rename from webprovisioning/sample.xml rename to webprovisioning/sample.msht