From 624bff7124831b90597122e868a9b4586af8d56d Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 14 Jul 2018 21:52:53 -0400 Subject: Fix generated Debian package names ("_" is illegal). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ccc61fd..3666b5f 100644 --- a/Makefile +++ b/Makefile @@ -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} -- cgit v1.2.3