make distcheck on modules

[Thomas Vander Stichele <thomas apestaart org>]

Hi all,

While trying to distcheck and release gnome-media, I ran into a few bugs
which I'm trying to fix along the way.

1) intltool tools variables (like $(INTLTOOL_MERGE)) expanding to the
wrong path.

I believe this is due to a patch in
http://bugzilla.gnome.org/show_bug.cgi?id=116362 for which I don't see
the need.  Asked the original submitter and I hope to resolve it with
him.  There is a second patch applied on top of it that hides other
issues.  I hope Kenneth has some time soon, if not I'll revert those
patches tomorrow so make distcheck works properly with intltool tools
again.

2) scrollkeeper spewing lots of
Cannot create log file: ${prefix}/var/log/scrollkeeper.log : No existe
el fichero o el directorio

This is due to a bug in the .h.in files for scrollkeeper in 0.3.12 and
0.3.13.  I've tested with 0.3.14 and updated jhbuild to use 0.3.14 as
well, so make sure you update your jhbuild directory from cvs and retry.

3) files being left after make distcheck has run in the help
directories:

This is due to a bug in omf.make and xmldocs.make copied from
scrollkeeper_examples 0.1.2

I've attached a sample patch for sound-juicer which I commited today. 
Basically, the files used DESTDIR to install properly, but didn't
uninstall with DESTDIR.  Also, the .out didn't get cleaned.
I'll get it fixed upstream in scrollkeeper_examples.  I noticed for
example mails from Paolo on gedit for the same problem.
Please try the attached patch and commit, and if you have problems let
me know and I'll help out.

Please check if these fixes apply to your module.  If anyone has any
trouble getting make distcheck to work on their module, let me know. 
I'm collecting info for a gnome maintainer guide.

Thanks,
Thomas

Dave/Dina : future TV today ! - http://davedina.apestaart.org/
<-*- thomas (dot) apestaart (dot) org -*->
Surprise sometimes
will come around
I will surprise you sometime
I'll come around
<-*- thomas (at) apestaart (dot) org -*->
URGent, best radio on the net - 24/7 ! - http://urgent.fm/

? out
? sound-juicer-0.5.8.tar.gz
Index: omf.make
===================================================================
RCS file: /cvs/gnome/sound-juicer/omf.make,v
retrieving revision 1.1
diff -u -p -r1.1 omf.make
--- omf.make	29 Jul 2003 12:31:54 -0000	1.1
+++ omf.make	30 Dec 2003 18:55:51 -0000
@@ -28,6 +28,7 @@
 
 omf_dest_dir=$(datadir)/omf/@PACKAGE@
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+CLEANFILES += *.out
 
 omf: omf_timestamp
 
@@ -47,7 +48,7 @@ install-data-hook-omf:
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
 		basefile=`basename $$file`; \
-		rm -f $(omf_dest_dir)/$$basefile; \
+		rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
 	done
-	-rmdir $(omf_dest_dir)
+	-rmdir $(DESTDIR)$(omf_dest_dir)
 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
Index: xmldocs.make
===================================================================
RCS file: /cvs/gnome/sound-juicer/xmldocs.make,v
retrieving revision 1.1
diff -u -p -r1.1 xmldocs.make
--- xmldocs.make	29 Jul 2003 12:31:54 -0000	1.1
+++ xmldocs.make	30 Dec 2003 18:55:51 -0000
@@ -84,7 +84,7 @@ uninstall-local-doc:
 	-if test "$(figdir)"; then \
 	  for file in $(srcdir)/$(figdir)/*.png; do \
 	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(docdir)/$(figdir)/$$basefile; \
+	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
 	  done; \
 	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
 	fi