[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 09df6364b51c4a2bbf24de8d644d1418d64be084

[code]

revision:            09df6364b51c4a2bbf24de8d644d1418d64be084
date:                2011-02-04T09:06:27
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.source-tree-cleanup
changelog:
* doc/Makefile.am (CLEANFILES): Files that are copied from the source
  into the same directory within the build directory should not be
  placed here, as they will be removed even when we build in the
  source directory...
* doc/Makefile.am (clean-local): ... Instead, place them in this
  target, which has a check if the build dir and the source dir are
  the same or not.


manifest:
format_version "1"

new_manifest [a46c3c28e18e2a6130e75b6364f62663dd803bff]

old_revision [ac8ec392956da631b03cd66f275fe1395d56ab5a]

patch "doc/Makefile.am"
 from [a131eb49aec9e8316a27277c87b3fed857ca3732]
   to [fa4370e4c1dc4acf09d437ef410595554cd18f50]
============================================================
--- doc/Makefile.am	a131eb49aec9e8316a27277c87b3fed857ca3732
+++ doc/Makefile.am	fa4370e4c1dc4acf09d437ef410595554cd18f50
@@ -12,6 +12,8 @@ ACLOCAL_AMFLAGS  = -I m4
 AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
 ACLOCAL_AMFLAGS  = -I m4
 
+CHECK_SRCDIR_EQ_BUILDDIR=[ "`cd \"$(srcdir)\"; pwd`" = "`pwd`" ]
+
 PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf			\
 	figures/difference-between-versions.pdf				\
 	figures/file-id-manifest-id.pdf figures/fork.pdf		\
@@ -41,8 +43,9 @@ TEXI_FRAGMENTS = pcrepattern.texi pcresy
 
 TEXI_FRAGMENTS = pcrepattern.texi pcresyntax.texi
 
-CLEANFILES = $(EPS_FIGURES) $(PDF_FIGURES_copied) $(PNG_FIGURES_copied) \
-	$(PNG_IMAGES_copied) $(HTML_EXTRA_copied)
+# Things that should only be removed when the build dir is different from
+# the source dir are handled by the clean-local target, further down.
+CLEANFILES = $(EPS_FIGURES)
 
 info_TEXINFOS = monotone.texi
 
@@ -134,3 +137,12 @@ monotone.html: monotone.texi $(srcdir)/v
 # dependencies.
 # Also, we don't need anything extra for htmldir, as it does things a bit
 # differently.
+
+
+# We have to be careful only to remove figures and images when they aren't
+# in the source directory.
+clean-local:
+	if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \
+	  rm -f $(PDF_FIGURES_copied) $(PNG_FIGURES_copied) \
+	      $(PNG_IMAGES_copied) $(HTML_EXTRA_copied); \
+	fi