From ff8f175cd235c21e559fa7154fca02a45b0a69a6 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Wed, 25 May 2016 09:58:43 -0400 Subject: [PATCH] libuavcan: Delete directories before unpacking --- canutils/libuavcan/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/canutils/libuavcan/Makefile b/canutils/libuavcan/Makefile index 5e13e7244..05fc45f61 100644 --- a/canutils/libuavcan/Makefile +++ b/canutils/libuavcan/Makefile @@ -182,6 +182,7 @@ $(LIBUAVCAN_PACKNAME): $(LIBUAVCAN_UNPACKNAME): $(LIBUAVCAN_PACKNAME) @echo "Unpacking: $< -> $@" + $(call DELDIR, $@) $(Q) $(UNPACK) $< $(Q) touch $@ @@ -191,6 +192,7 @@ $(DSDL_PACKNAME): $(DSDL_UNPACKNAME): $(DSDL_PACKNAME) @echo "Unpacking: $< -> $@" + $(call DELDIR, $@) $(Q) $(UNPACK) $< $(Q) touch $@ @@ -200,11 +202,13 @@ $(PYUAVCAN_PACKNAME): $(PYUAVCAN_UNPACKNAME): $(PYUAVCAN_PACKNAME) @echo "Unpacking: $< -> $@" + $(call DELDIR, $@) $(Q) $(UNPACK) $< $(Q) touch $@ libuavcan: $(LIBUAVCAN_UNPACKNAME) $(DSDL_UNPACKNAME) $(PYUAVCAN_UNPACKNAME) - $(Q) cp -R $(LIBUAVCAN_UNPACKNAME) libuavcan + $(call DELDIR, $@) + $(Q) cp -R $(LIBUAVCAN_UNPACKNAME) $@ $(Q) if [ -r $(LIBUAVCAN_PATCHNAME) ]; then \ cat $(LIBUAVCAN_PATCHNAME) | patch -p0 || { echo "ERROR: Patch failed"; exit 1; }; \ fi