From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 29 Jul 2009 14:18:16 +0000 (+0100)
Subject: pctb renamed to yarrg: Makefile moves stuff across
X-Git-Tag: 3.0~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=03d4218e5ced913f70a1fd9308edbd8f9615703c

pctb renamed to yarrg: Makefile moves stuff across
---

diff --git a/yarrg/Makefile b/yarrg/Makefile
index baf8760..0df5174 100644
--- a/yarrg/Makefile
+++ b/yarrg/Makefile
@@ -33,7 +33,7 @@ CFLAGS += $(WARNINGS) $(WERROR) $(OPTIMISE) $(DEBUG)
 
 TARGETS= ypp-commodities
 
-all: $(TARGETS)
+all: clean-other-directory $(TARGETS)
 
 CONVERT_OBJS= convert.o ocr.o pages.o structure.o common.o rgbimage.o resolve.o
 
@@ -53,3 +53,12 @@ realclean: clean
 	rm -f _master-*.txt _master-*.txt.gz _local-*.txt
 	rm -f ./#pages#.ppm ./#upload-*#.html ./#commodmap#.tsv
 	rm -f ./#master-*#.txt ./#local-*#.txt raw.tsv
+
+clean-other-directory:
+	@set -e; if test -d ../pctb && ! test -L ../pctb; then \
+		echo '*** tidying up ../pctb; moving local data here ***'; \
+		set -x; \
+		find ../pctb -path '../pctb/_local-*.txt' -exec mv '{}' . \;; \
+		$(MAKE) -C ../pctb -f ../yarrg/Makefile realclean; \
+		rmdir ../pctb; \
+	fi