From ed50c9df69e00e0dc142c7e04474463efa73f5c4 Mon Sep 17 00:00:00 2001 From: MarijnS95 Date: Mon, 9 Sep 2019 21:05:55 +0200 Subject: Fix copy rule correctness (requirement for Android 10). Signed-off-by: MarijnS95 Change-Id: Ia2aca734ffdb61fd4237231f2cc60400a4cf9145 --- Android.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 9ff610f9..4fcd4369 100644 --- a/Android.mk +++ b/Android.mk @@ -50,18 +50,18 @@ include $(BUILD_EXECUTABLE) NANO_ETC := $(TARGET_OUT_ETC)/$(LOCAL_MODULE) syntax_files := $(wildcard $(LOCAL_PATH)/syntax/*.nanorc) -NANO_SYNTAX := $(addprefix $(LOCAL_PATH)/syntax/,$(notdir $(syntax_files))) -$(NANO_SYNTAX): $(LOCAL_INSTALLED_MODULE) +NANO_SYNTAX := $(addprefix $(NANO_ETC)/,$(notdir $(syntax_files))) +$(NANO_SYNTAX): $(NANO_ETC)/%: $(LOCAL_PATH)/syntax/% | $(LOCAL_BUILT_MODULE) @echo "Install: $@ -> $(NANO_ETC)" - @mkdir -p $(NANO_ETC) - $(hide) cp $@ $(NANO_ETC) + @mkdir -p $(dir $@) + cp $< $@ nanorc_file := $(LOCAL_PATH)/etc/nanorc -NANO_NANORC := $(addprefix $(LOCAL_PATH)/etc/,$(notdir $(nanorc_file))) -$(NANO_NANORC): $(LOCAL_INSTALLED_MODULE) +NANO_NANORC := $(addprefix $(NANO_ETC)/,$(notdir $(nanorc_file))) +$(NANO_NANORC): $(nanorc_file) @echo "Install: $@ -> $(NANO_ETC)" - @mkdir -p $(NANO_ETC) - $(hide) cp $@ $(NANO_ETC) + @mkdir -p $(dir $@) + $(hide) cp $< $@ ALL_DEFAULT_INSTALLED_MODULES += $(NANO_SYNTAX) $(NANO_NANORC) -- cgit v1.2.3