From 56eb7c2dc3989942980879d86bda6755378ced27 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 13 Aug 2007 17:57:05 -0400 Subject: [PATCH] Borrow some autofoo goo from nautilus to make the mimedb stuff distcheck --- Makefile.am | 2 ++ configure.ac | 6 ++++++ data/Makefile.am | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index b47df4d7..581e0a44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,3 +14,5 @@ EXTRA_DIST = \ intltool-merge.in \ intltool-update.in \ intltool-extract.in + +DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb diff --git a/configure.ac b/configure.ac index 0994fd63..b7b348cd 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,12 @@ AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) AM_GLIB_GNU_GETTEXT +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([bin/sugar], [chmod +x sugar]) AC_OUTPUT([ diff --git a/data/Makefile.am b/data/Makefile.am index 4c613ab1..2ab45601 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -23,14 +23,18 @@ mimedir = $(datadir)/mime/packages mime_DATA = $(mime_xml_files) install-data-hook: +if ENABLE_UPDATE_MIMEDB if [ -z "$$DESTDIR" ]; then \ update-mime-database "$(datadir)/mime"; \ fi +endif uninstall-hook: +if ENABLE_UPDATE_MIMEDB if [ -z "$$DESTDIR" ]; then \ update-mime-database "$(datadir)/mime"; \ fi +endif EXTRA_DIST = $(sugar_DATA) $(mime_xml_in_files) em.py gtkrc.em -CLEANFILES = $(GTKRC_FILES) +CLEANFILES = $(GTKRC_FILES) $(mime_xml_files)