shaba/mkimage-profiles
1
0
Fork 0
forked from altcloud/mkimage-profiles
Code Issues 1 Pull Requests Releases Wiki Activity

Makefile: fixed an interbug

Browse Source 
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 768df7e9e9
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.
This commit is contained in:
Michael Shigorin 2013-08-05 11:01:19 +00:00
parent fbe571e296
commit 84ad4092dc
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -6,15 +6,16 @@
-include $(HOME)/.mkimage/profiles.mk -include $(HOME)/.mkimage/profiles.mk
# for immediate assignment # 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/') | sed 's/i686/i586/; s/armv7.*/armh/; s/armv.*/arm/; s/ppc.*/ppc/')
endif endif
ifndef ARCHES
ARCHES := $(ARCH)
endif endif
export ARCHES
export ARCHES ARCH
export PATH := $(CURDIR)/bin:$(PATH) export PATH := $(CURDIR)/bin:$(PATH)