mirror of
https://salsa.debian.org/images-team/debian-cd.git
synced 2024-11-24 15:19:51 -01:00
Extend the mkisofs-override code to work with multi-arch too
This commit is contained in:
parent
07e283ef7f
commit
8e1cbeed1f
18
Makefile
18
Makefile
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user