bundles: Make test-bundle.zip not have an internal directory

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile b/Makefile
index e0afd69b52ce764cdb19d23d6a98e80837d5c5e0..a25858ffb778fa0ad50740c46047fced307d3bed 100644 (file)
--- 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) ----------