pctb renamed to yarrg: Makefile moves stuff across

diff --git a/yarrg/Makefile b/yarrg/Makefile
index baf876015d8740ee65f506855f06d279a397bfe4..0df5174400910f07356547c6ad4151f473e6c3aa 100644 (file)
--- 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