Makefile: fixed an interbug

This inobvious buglet has been spotted shortly after 1.1.0 refactoring was roughly over; the problem is that armh-specific targets would get ignored without explicit ARCH=armh. It's commit 768df7e9 which streamlined introspection within main.mk and a bug in Makefile which left ARCH empty even upon having autodetected it for ARCHES. The current version is more straightforward as a bonus.

Makefile: fixed an interbug
84ad4092 · Michael Shigorin · fbe571e2 · 84ad4092
Commit 84ad4092 authored Aug 05, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

Makefile Makefile +7 -6

No files found.
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,16 @@
 -include $(HOME)/.mkimage/profiles.mk
 # for immediate assignment
-ifndef ARCHES
+ifndef ARCH
-ifdef ARCH
+ARCH := $(shell arch \
-ARCHES := $(ARCH)
-else
-ARCHES := $(shell arch \
 	| sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
+ifndef ARCHES
+ARCHES := $(ARCH)
 endif
-export ARCHES
+export ARCHES ARCH
 export PATH := $(CURDIR)/bin:$(PATH)