diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | icon/Makefile.am | 4 | 
2 files changed, 13 insertions, 0 deletions
| diff --git a/configure.ac b/configure.ac index 311ebbe3..9f2cb0d7 100644 --- a/configure.ac +++ b/configure.ac @@ -497,6 +497,14 @@ esac  AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes]) +AC_ARG_ENABLE([install-shared-mime-info], +	      [AS_HELP_STRING([--disable-install-shared-mime-info], +	                      [disable installing shared mime info files (default=yes)])], +	      [INSTALL_SHARED_MIME_INFO=$enableval], +	      [INSTALL_SHARED_MIME_INFO=yes]) + +AM_CONDITIONAL([INSTALL_SHARED_MIME_INFO], [test x$INSTALL_SHARED_MIME_INFO = xyes]) +  AC_OUTPUT([  Makefile  src/Makedefs @@ -557,6 +565,7 @@ echo "    Android support.............: ${HAVE_ANDROID_SDK}"  echo "    STlink support..............: ${HAVE_STLINK}"  echo "    Local pdclib................: ${HAVE_PDCLIB}"  echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}" +echo "    install shared mime info....: ${INSTALL_SHARED_MIME_INFO}"  echo ""  echo "  Java"  echo "    freetts.....................: ${FREETTS}" diff --git a/icon/Makefile.am b/icon/Makefile.am index d0cd9853..c08e9236 100644 --- a/icon/Makefile.am +++ b/icon/Makefile.am @@ -85,8 +85,10 @@ MIME_ICONS = $(EEPROM_ICON) $(TELEM_ICON) $(MPD_ICON)  mimeicondir = $(ICON_THEME)/scalable/mimetypes  mimeicon_DATA = $(MIME_ICONS) +if INSTALL_SHARED_MIME_INFO  mimedir = $(datadir)/mime/packages  mime_DATA = org-altusmetrum-mimetypes.xml +endif  pixmapdir = $(datadir)/pixmaps  pixmap_DATA = altusmetrum.xpm @@ -116,9 +118,11 @@ clean-local:  	$(RM) *.build *.ico *.rc *.icns *.o *.exe $(MPD_ICON)  	$(RM) altusmetrum.xpm +if INSTALL_SHARED_MIME_INFO  install-data-hook:  	update-mime-database $(DESTDIR)$(datadir)/mime  	update-icon-caches $(DESTDIR)$(ICON_THEME) +endif  $(MPD_ICON): $(MP_ICON)  	$(LN_S) $(MP_ICON) $@ | 
