From 78400d88d56442b12159a7d48502f043b7523b5c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 4 May 2021 21:06:32 +0100
Subject: [PATCH] bundles: Make test-bundle.zip not have an internal directory

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e0afd69b..a25858ff 100644
--- a/Makefile
+++ b/Makefile
@@ -322,12 +322,13 @@ templates/shapelib.html: $(TARGET_DIR)/debug/otterlib $(LIBRARY_FILES)
 #---------- examples ----------
 
 EXAMPLE_BUNDLE_INPUT_DEPS := $(shell					\
-	cd examples && find test-bundle \! \( -name '*~' -o -name '.*' \) \
+	cd examples/test-bundle/ && find \! \( -name '*~' -o -name '.*' \) \
 )
 
-examples/test-bundle.zip: $(addprefix examples/,$(EXAMPLE_BUNDLE_INPUT_DEPS))
-	set -e; rm -f $@.tmp; cd examples; zip -DXy $(notdir $@).tmp \
-		$(EXAMPLE_BUNDLE_INPUT_DEPS)
+examples/test-bundle.zip: \
+ $(addprefix examples/test-bundle/, $(EXAMPLE_BUNDLE_INPUT_DEPS))
+	set -e; rm -f $@.tmp; cd examples/test-bundle/; \
+	zip -DXy ../$(notdir $@).tmp $(EXAMPLE_BUNDLE_INPUT_DEPS)
 	mv -f $@.tmp $@
 
 #---------- webdriver tests (wdt) ----------
-- 
2.30.2