diff options
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -22,7 +22,7 @@ GIT_BRANCHES := $(filter-out HEAD,$(sort $(notdir $(shell git for-each-ref --fo # other package names (constructed on other branches) with which this # one conflicts. -PACKAGE_BRANCH = ${PACKAGE_BASE_NAME}$(and $(filter-out master,$(1)),-$(1)) +PACKAGE_BRANCH = ${PACKAGE_BASE_NAME}$(and $(filter-out master,$(1)),-$(subst _,-,$(1))) PACKAGE_NAME := $(call PACKAGE_BRANCH,${GIT_BRANCH}) PACKAGE_CONFLICT := $(foreach I,$(filter-out ${GIT_BRANCH},${GIT_BRANCHES}),$(call PACKAGE_BRANCH,${I})) PACKAGE_VERSION := ${PACKAGE_BASE_VERSION}.${GIT_VERSION} |