Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extend the mkisofs-override code to work with multi-arch too

This commit is contained in:
Steve McIntyre 2010-12-27 23:17:44 +00:00
parent 07e283ef7f
commit 8e1cbeed1f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -42,16 +42,14 @@ ifeq ($(shell echo $(ARCHES) | sed 's/.*source.*/1/'),1)
export INC_SOURCE=yes
endif
export NUM_ARCHES=$(shell echo $(ARCHES) | wc -w)
ifeq ($(NUM_ARCHES),1)
ARCH_MKISOFS = ${${ARCHES}_MKISOFS}
ARCH_MKISOFS_OPTS = ${${ARCHES}_MKISOFS_OPTS}
ifneq (${ARCH_MKISOFS},)
MKISOFS = ${ARCH_MKISOFS}
endif
ifneq (${ARCH_MKISOFS_OPTS},)
MKISOFS_OPTS = ${ARCH_MKISOFS_OPTS}
endif
UNDER_ARCHES=$(shell echo $(ARCHES) | sed 's/\ /_/g')
ARCH_MKISOFS = ${${UNDER_ARCHES}_MKISOFS}
ARCH_MKISOFS_OPTS = ${${UNDER_ARCHES}_MKISOFS_OPTS}
ifneq (${ARCH_MKISOFS},)
MKISOFS = ${ARCH_MKISOFS}
endif
ifneq (${ARCH_MKISOFS_OPTS},)
MKISOFS_OPTS = ${ARCH_MKISOFS_OPTS}
endif
## Internal variables