--- conglomerate/src/plugin-sgml.c	Fri Jul 30 06:18:40 2004
+++ conglomerate/src/plugin-patched-sgml.c	Fri Oct 29 07:31:15 2004
@@ -111,7 +111,7 @@
 
 	g_message("sgml_importer_action_callback");
 
-	argv[0] = "sgml2xml";
+	argv[0] = "osx";
 	argv[1] = (gchar*)uri; /* FIXME: this is GnomeVFS uri path string, not a POSIX path */
 	argv[2] = NULL;
 
--- conglomerate/omf.make	Thu Jan 22 11:45:14 2004
+++ conglomerate/omf-patched.make	Mon Jul 19 15:41:07 2004
@@ -42,7 +42,6 @@
 	for file in $(omfincfile); do \
 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(docdir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
@@ -50,4 +49,3 @@
 		rm -f $(omf_dest_dir)/$$basefile; \
 	done
 	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
diff -Nurd conglomerate-0.9.1-orig/doc/reference/Makefile.in conglomerate-0.9.1/doc/reference/Makefile.in
--- conglomerate-0.9.1-orig/doc/reference/Makefile.in	2005-06-21 06:20:42.000000000 +0200
+++ conglomerate-0.9.1/doc/reference/Makefile.in	2006-04-10 13:53:17.000000000 +0200
@@ -389,8 +389,8 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
-	(installfiles=`echo $(srcdir)/html/*.html`; \
-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
+	(installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
 	then echo '-- Nothing to install' ; \
 	else \
 	  for i in $$installfiles; do \
diff -Nurd -x'*~' conglomerate-0.9.1.orig/src/Makefile.in conglomerate-0.9.1/src/Makefile.in
--- conglomerate-0.9.1.orig/src/Makefile.in	2005-06-21 00:16:45.000000000 -0400
+++ conglomerate-0.9.1/src/Makefile.in	2007-06-06 22:31:40.000000000 -0400
@@ -450,6 +450,7 @@
 
 
 INCLUDES = $(BASE_CFLAGS) \
+	-I$(srcdir)/recent-files/ \
 	$(CONGLOMERATE_CFLAGS) \
 	$(PRINTING_CFLAGS) \
 	$(LIBFO_CFLAGS) \
@@ -461,7 +462,6 @@
 	-DSYSCONFDIR=\""$(sysconfdir)/conglomerate"\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DLIBDIR=\""$(libdir)/conglomerate"\" \
-	-I$(srcdir)/recent-files/ \
 	$(NULL)