From 635d394fe3c040c68753b757101439d1b1368002 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 16 Feb 2021 19:24:15 +0100
Subject: [PATCH] * builds/toplevel.mk: Fix previous commit.

<top_level>: Use `TOP_DIR` in `wildcard` function.
(check_out_submodule, copy_submodule): Move down to come after
definition of `all` rule.
Call `mkdir` conditionally.
---
 ChangeLog          |  9 +++++++++
 builds/toplevel.mk | 36 +++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd4d7d7b0..28c6a19aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2021-02-16  Werner Lemberg  <wl@gnu.org>
+
+	* builds/toplevel.mk: Fix previous commit.
+
+	<top_level>: Use `TOP_DIR` in `wildcard` function.
+	(check_out_submodule, copy_submodule): Move down to come after
+	definition of `all` rule.
+	Call `mkdir` conditionally.
+
 2021-02-16  Werner Lemberg  <wl@gnu.org>
 
 	* builds/toplevel.mk: Use rules for handling 'dlg'.
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index d9de4145a..789d6fbf2 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -104,21 +104,6 @@ ifneq ($(findstring setup,$(MAKECMDGOALS)),)
 endif
 
 
-.PHONY: check_out_submodule copy_out_submodule
-
-check_out_submodule:
-	$(info Checking out submodule in `subprojects/dlg')
-	git submodule init
-	git submodule update
-
-copy_submodule:
-	$(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
-	mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)
-	$(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
-	$(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
-	$(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
-
-
 # Include the automatic host platform detection rules when we need to
 # check the platform.
 #
@@ -131,8 +116,8 @@ ifdef check_platform
   # For builds directly from the git repository we need to copy files
   # from `subprojects/dlg' to `src/dlg' and `include/dlg'.
   #
-  ifeq ($(wildcard src/dlg/dlg.*),)
-    ifeq ($(wildcard subprojects/dlg/*),)
+  ifeq ($(wildcard $(TOP_DIR)/src/dlg/dlg.*),)
+    ifeq ($(wildcard $(TOP_DIR)/subprojects/dlg/*),)
       copy_submodule: check_out_submodule
     endif
 
@@ -181,6 +166,23 @@ else
 endif # test check_platform
 
 
+.PHONY: check_out_submodule copy_submodule
+
+check_out_submodule:
+	$(info Checking out submodule in `subprojects/dlg')
+	git submodule init
+	git submodule update
+
+copy_submodule:
+	$(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
+  ifeq ($(wildcard include/dlg),)
+	mkdir $(subst /,$(SEP),include/dlg)
+  endif
+	$(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg)
+	$(COPY) $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg)
+	$(COPY) $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg)
+
+
 # We always need the list of modules in ftmodule.h.
 #
 all setup: $(FTMODULE_H)