diff --git a/Makefile b/Makefile index 0b9ef0c5b327e1b9df9e0f7b91d6936cfff67ecb..52b2cd5b351a5037763d10f52e7e2e567800d52a 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,9 @@ ISO_IMAGE=$(ISO_IMAGE_DEST)/image.iso ISO_URL=$(ISO_BASE_URL)/$(ISO_RELEASE)/$(ISO_CHANNEL) ISO_CONTENT=$(ISO_IMAGE_DEST)/content -ifndef ISO_PREFIX +ifneq (,$(findstring release-prefix,$(ISO_PATTERN_FLAGS))) + ISO_PREFIX=$(ISO_RELEASE)- +else ISO_PREFIX=$(ISO_FLAVOR)-$(ISO_VERSION)- endif diff --git a/config/Makefile.conf.defaults b/config/Makefile.conf.defaults index d8a8777b46bf88e23925ba51b5e13a74cfc92371..0ba1beda1d141e289134d89af445ae4ec1b82d09 100644 --- a/config/Makefile.conf.defaults +++ b/config/Makefile.conf.defaults @@ -25,6 +25,7 @@ ISO_RELEASE=trusty ISO_CHANNEL=release ISO_VERSION=14.04.1 ISO_FLAVOR=kubuntu +ISO_PATTERN_FLAGS= IMAGE_GIT_URL=https://www.fsmpi.rwth-aachen.de/git/lipstick IMAGE_GIT_BRANCH=ws14