From 49372a222f13828be867c552dd54f7245c90cf58 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 20 Aug 2018 11:04:35 +0200 Subject: [PATCH] Makefile.am: use $(@D)/$(@F) instead of $(dir/notdir ...) --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e2d96cae..320b779cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -325,7 +325,7 @@ $(AIDL_JAVA_FILES): android/build/src/org/musicpd/%.java: $(srcdir)/android/src/ $(AIDL) -Iandroid/build/src -oandroid/build/src $(patsubst %.java,%.aidl,$@) $(ANDROID_XML_RES_COPIES): $(ANDROID_XML_RES) - @$(MKDIR_P) $(dir $@) + @$(MKDIR_P) $(@D) cp $(patsubst android/build/%,$(srcdir)/android/%,$@) $@ android/build/resources.apk: $(ANDROID_XML_RES_COPIES) android/build/res/drawable/icon.png android/build/res/drawable/notification_icon.png @@ -368,7 +368,7 @@ android/build/res/drawable/notification_icon.png: android/build/res/drawable/ico .DELETE_ON_ERROR: android/build/unsigned.apk android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/$(ANDROID_ABI)/libmpd.so cp android/build/resources.apk $@ - cd $(dir $@) && zip -q -r $(notdir $@) classes.dex lib + cd $(@D) && zip -q -r $(@F) classes.dex lib android/build/$(APK_NAME)-debug.apk: android/build/unsigned.apk jarsigner -keystore $(HOME)/.android/debug.keystore -storepass android -signedjar $@ $< androiddebugkey