Index: docs/manual/Makefile.am
===================================================================
--- docs/manual/Makefile.am	(revision 302)
+++ docs/manual/Makefile.am	(working copy)
@@ -13,7 +13,7 @@
 	$(mkinstalldirs) html
 	xsltproc -o html/ --catalogs $(DOCBOOK_STYLESHEET) $<
 
-libsigc_manual-html.tar.gz: $(srcdir)/html
+libsigc_manual-html.tar.gz: html
 	tar -cf - $< | gzip > $@
 
 %.dvi: $(srcdir)/%.xml
@@ -26,16 +26,16 @@
 	db2pdf $<
 
 
-post-lumps: $(srcdir)/libsigc_manual.dvi $(srcdir)/libsigc_manual.ps $(srcdir)/libsigc_manual.pdf $(srcdir)/libsigc_manual-html.tar.gz
+post-lumps: libsigc_manual.dvi libsigc_manual.ps libsigc_manual.pdf libsigc_manual-html.tar.gz
 	tar -cf - $^ | ssh $$SSH_OPT $$USER@libsigc.sourceforge.net "cd $(libsigc_manual) ; tar -xvf - ; chmod a+r,g+w * ; chgrp libsigc *"
 
-post-html: $(srcdir)/html/index.html
+post-html: html/index.html
 	(cd html && tar -cf - *.html | gzip -3 | \
 	 ssh $$SSH_OPT $$USER@libsigc.sourceforge.net "cd $(libsigc_manual)/html ; gunzip | tar -xvf - ; chmod a+r,g+w * ; chgrp libsigc *")
 
 tutorialdir = $(libsigc_docdir)/tutorial/html
 
-install-tutorial: $(srcdir)/html/index.html
+install-tutorial: html/index.html
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(tutorialdir)
 	@dir='$(<D)'; for p in $$dir/*.html ; do \
@@ -44,7 +44,7 @@
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(tutorialdir)/$$f; \
 	done
 
-uninstall-tutorial: $(srcdir)/html/index.html
+uninstall-tutorial: html/index.html
 	@$(NORMAL_UNINSTALL)
 	@dir='$(<D)'; for p in $$dir/*.html ; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
@@ -56,9 +56,9 @@
 
 uninstall-local: uninstall-tutorial
 
-all-local: $(srcdir)/html/index.html
+all-local: html/index.html
 
 clean-local:
-	-rm -rf $(srcdir)/html
-	-rm -f $(srcdir)/libsigc_manual.dvi $(srcdir)/libsigc_manual.ps $(srcdir)/libsigc_manual.pdf $(srcdir)/libsigc_manual-html.tar.gz
+	-rm -rf html
+	-rm -f libsigc_manual.dvi libsigc_manual.ps libsigc_manual.pdf libsigc_manual-html.tar.gz
 
Index: docs/reference/Makefile.am
===================================================================
--- docs/reference/Makefile.am	(revision 302)
+++ docs/reference/Makefile.am	(working copy)
@@ -10,30 +10,30 @@
              beautify_docs.pl \
              html libsigc_doxygen_tags
 
-html: $(srcdir)/html/index.html
+html: html/index.html
 html/index.html: $(doxygen_configfile_source) $(beautify_docs)
 	-rm -rf html
 	SRCDIR=$(srcdir) TOP_SRCDIR=$(top_srcdir) doxygen $(doxygen_configfile)
 	$(PERL_PATH) $(beautify_docs) html
 
 
-libsigc-reference-html.tar.gz: $(srcdir)/html/index.html
+libsigc-reference-html.tar.gz: html/index.html
 	tar cf - html | gzip -c --best >$@
 
-libsigc-reference-html.tar.bz2: $(srcdir)/html/index.html
+libsigc-reference-html.tar.bz2: html/index.html
 	tar cf - html | bzip2 -c >$@
 
-post-html: $(srcdir)/html/index.html
+post-html: html/index.html
 	rsync $(rsync_args) -r html/ $$USER@shell.sourceforge.net:$(web_path_reference)/html/
 
 doc-clean:
-	-rm -rf $(srcdir)/html
-	-rm -f $(srcdir)/libsigc_doxygen_tags
-	-rm -f $(srcdir)/libsigc-reference-html.tar.gz $(srcdir)/libsigc-reference-html.tar.bz2
+	-rm -rf html
+	-rm -f libsigc_doxygen_tags
+	-rm -f libsigc-reference-html.tar.gz libsigc-reference-html.tar.bz2
 
 referencedir = $(libsigc_docdir)/reference/html
 
-install-reference: $(srcdir)/html/index.html
+install-reference: html/index.html
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(referencedir)
 	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot ; do \
@@ -42,7 +42,7 @@
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(referencedir)/$$f; \
 	done
 
-uninstall-reference: $(srcdir)/html/index.html
+uninstall-reference: html/index.html
 	@$(NORMAL_UNINSTALL)
 	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot ; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
Index: sigc++/Makefile.am
===================================================================
--- sigc++/Makefile.am	(revision 302)
+++ sigc++/Makefile.am	(working copy)
@@ -84,10 +84,10 @@
 M4_DIR = $(top_srcdir)/sigc++/macros
 
 # Rules to generate .h and .cc from .h.m4 and .cc.m4:
-%.h: macros/%.h.m4 $(M4_DIR)/template.macros.m4
+%.h: macros/%.h.m4 $(M4_DIR)/template.macros.m4 build-subdirs-stamp
 	        $(M4) $(M4_INCLUDES) $(DEFINES) -I $(M4_DIR) -I macros $<  > $@
 
-%.cc: macros/%.cc.m4 $(M4_DIR)/template.macros.m4
+%.cc: macros/%.cc.m4 $(M4_DIR)/template.macros.m4 build-subdirs-stamp
 	        $(M4) $(M4_INCLUDES) $(DEFINES) -I $(M4_DIR) -I macros $<  > $@
 
 # This would be a necessary target for VPATH builds from a clean CVS checkout,
