From 01fc36a9604426131865d452271e9193697afa36 Mon Sep 17 00:00:00 2001
From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de>
Date: Thu, 13 Apr 2023 21:12:34 +0200
Subject: [PATCH] make git submodule update depend on subdir

---
 .circleci/config.yml       | 1 -
 .github/workflows/test.yml | 2 --
 Makefile                   | 6 +++---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index edd6b61..919d30f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,6 @@ jobs:
           key: ocrd-resources-{{ checksum "requirements.txt" }}-{{ checksum "Makefile" }}
           paths:
             ocrd-resources
-      - run: git submodule update --init
       - run: make test
 
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 17491a2..8b90582 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -32,8 +32,6 @@ jobs:
       with:
         key: models
         path: /home/runner/.local/share/ocrd-resources/ocrd-sbb-binarize/*
-    - name: Clone submodules
-      run: git submodule update --init
     - name: Install dependencies for test
       # also downloads models, if not already present
       run: make models test/assets
diff --git a/Makefile b/Makefile
index a5be943..e4f5b87 100644
--- a/Makefile
+++ b/Makefile
@@ -24,13 +24,13 @@ install:
 models:
 	ocrd resmgr download ocrd-sbb-binarize "*"
 
-repo/assets:
+repo/assets/data:
 	git submodule update --init
 
 # Setup test data
-test/assets: repo/assets
+test/assets: repo/assets/data
 	@mkdir -p $@
-	cp -r -t $@ repo/assets/data/*
+	cp -r -t $@ $</*
 
 # Run tests
 .PHONY: test