From 608b68fd49ca47966338fb3c56fe03ad6908864a Mon Sep 17 00:00:00 2001 From: NicJA Date: Sat, 6 Apr 2019 14:14:19 +0000 Subject: [PATCH] don't define the touchfileflag in the wrong location git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@56148 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- config/make.tmpl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config/make.tmpl b/config/make.tmpl index 8542c6efcb..410e5377c7 100644 --- a/config/make.tmpl +++ b/config/make.tmpl @@ -3384,16 +3384,17 @@ ifeq (%(use_build_env),yes) BUILD_ENV := $(%(mmake)-cfg-env) endif +%(mmake)-touchfileflag ?= $(%(mmake)-pkgdir)/.files-touched + ifneq ("$(wildcard %(srcdir)/Makefile)","") # in an ideal world, we would depend on the files in the source directory, # so we could copy them when they change. unfortunately filenames with -# spaces causes problems with this +# spaces cause problems with this $(%(mmake)-pkgdir)/.local-copy: %mkdirs_q $(%(mmake)-pkgdir) $(Q)$(ECHO) "Copying Local-Build Sources to \`$(patsubst $(TOP)/%,%,$(abspath $(%(mmake)-pkgdir)))'" $(Q)$(CP) -Rf "%(srcdir)/." $(%(mmake)-pkgdir)/ && $(TOUCH) $@ -%(mmake)-touchfileflag ?= $(%(mmake)-pkgdir)/.files-touched $(%(mmake)-touchfileflag) : $(%(mmake)-pkgdir)/.local-copy %(mmake)-cfg-srcdir=$(%(mmake)-pkgdir) @@ -3448,10 +3449,12 @@ $(%(mmake)-installflag) : $(%(mmake)-configflag) $(TOUCH) $@ -r $^; \ fi +ifneq ($(%(mmake)-touchfileflag),) $(%(mmake)-touchfileflag): %mkdirs_q $(%(mmake)-pkgdir) $(Q)find %(srcdir) -exec $(TOUCH) -c -r $(%(mmake)-cfg-srcdir)/configure '{}' \; && \ $(TOUCH) $@ +endif #MM %(mmake)-uninstall : @@ -3578,10 +3581,12 @@ $(%(mmake)-installflag) : $(%(mmake)-cmakeflag) fi %(mmake)-touchfileflag ?= $(%(mmake)-pkgdir)/.files-touched +ifneq ($(%(mmake)-touchfileflag),) $(%(mmake)-touchfileflag): %mkdirs_q $(%(mmake)-pkgdir) find %(srcdir) -exec $(TOUCH) -c -r %(srcdir)/CMakeLists.txt '{}' \; && \ $(TOUCH) $@ +endif #MM %(mmake)-cmake : $(%(mmake)-cmakeflag) -- 2.11.4.GIT