From: Jim Evins <evins@snaught.com>
Date: Mon, 24 Oct 2005 01:24:50 +0000 (+0000)
Subject: 2005-10-23  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_3_0~400
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2bd3499f59f15f1ba3d83aca12dc895ede9c9fcc;p=glabels

2005-10-23  Jim Evins  <evins@snaught.com>

	* configure.in:
	* data/mime/Makefile.am:
		Added configure options to disable update-mime-database and
		update-desktop-database as part of the install.  Patch
		provided by Leonardo Boshell (qhoracio@sourceforge.net).


git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@555 f5e0f49d-192f-0410-a22d-a8d8700d0965
---

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index a03b3a64..7a71a796 100644
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,6 +1,12 @@
 2005-10-23  Jim Evins  <evins@snaught.com>
 
-	reviewed by: <delete if not using a buddy>
+	* configure.in:
+	* data/mime/Makefile.am:
+		Added configure options to disable update-mime-database and
+		update-desktop-database as part of the install.  Patch
+		provided by Leonardo Boshell (qhoracio@sourceforge.net).
+
+2005-10-23  Jim Evins  <evins@snaught.com>
 
 	* libglabels/xml.h:
 	* libglabels/xml.c: (gl_xml_get_prop_string),
diff --git a/glabels2/configure.in b/glabels2/configure.in
index 7bde960d..fa0542e1 100644
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -70,7 +70,7 @@ AC_SUBST(LIBGNOMEPRINT_REQUIRED)
 AC_SUBST(LIBGNOMEPRINTUI_REQUIRED)
 AC_SUBST(LIBGNOMECANVAS_REQUIRED)
 AC_SUBST(LIBGLADE_REQUIRED)
-               
+
 
 dnl ---------------------------------------------------------------------------
 dnl - GLABELS prerequisites
@@ -131,6 +131,16 @@ AM_CONDITIONAL(HAVE_NEW_MIME, test x$UPDATE_MIME_DATABASE != xno)
 AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
 AM_CONDITIONAL(HAVE_NEWER_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
 
+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_ARG_ENABLE(update-desktopdb, AC_HELP_STRING([--disable-update-desktopdb],
+              [disable the update-desktop-database after install [default=no]]),,
+              enable_update_desktopdb=yes)
+AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
+
 
 dnl ---------------------------------------------------------------------------
 dnl - Supported languages
diff --git a/glabels2/data/mime/Makefile.am b/glabels2/data/mime/Makefile.am
index bf943c7c..027c1022 100644
--- a/glabels2/data/mime/Makefile.am
+++ b/glabels2/data/mime/Makefile.am
@@ -28,18 +28,26 @@ CLEANFILES = $(keys_files) $(xml_files)
 
 
 install-data-hook:
+if ENABLE_UPDATE_MIMEDB
 if HAVE_NEW_MIME
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
 endif
+endif
+if ENABLE_UPDATE_DESKTOPDB
 if HAVE_NEWER_MIME
 	$(UPDATE_DESKTOP_DATABASE) 
 endif
+endif
 
 uninstall-hook:
+if ENABLE_UPDATE_MIMEDB
 if HAVE_NEW_MIME
 	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
 endif
+endif
+if ENABLE_UPDATE_DESKTOPDB
 if HAVE_NEWER_MIME
 	$(UPDATE_DESKTOP_DATABASE) 
 endif
+endif
 
diff --git a/glabels2/gtk-doc.make b/glabels2/gtk-doc.make
index 91cdd34d..445c6e85 100644
--- a/glabels2/gtk-doc.make
+++ b/glabels2/gtk-doc.make
@@ -25,6 +25,7 @@ EXTRA_DIST = 				\
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE).types		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
@@ -48,7 +49,7 @@ all-local: html-build.stamp
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	@echo '*** Scanning header files ***'
 	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
 	    cd $(srcdir) ; \
@@ -68,7 +69,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
 tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo '*** Rebuilding template files ***'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
 	touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -76,11 +77,11 @@ tmpl.stamp: tmpl-build.stamp
 
 #### xml ####
 
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
+sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
 	@echo '*** Building XML ***'
 	@-chmod -R u+w $(srcdir)
 	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
@@ -146,8 +147,5 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	-cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
 
 .PHONY : dist-hook-local