From f62eb9f533a32622fa1cfe13526c33e4e35eb872 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 5 Sep 2016 08:19:02 +0200 Subject: [PATCH 1/1] Bugfix: re-add single quotes around I3_VERSION Without single quotes, the version is not passed correctly to the compiler, and building Debian packages fails. related to #2437 --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index e99f93c8..b9569ca7 100644 --- a/common.mk +++ b/common.mk @@ -22,7 +22,7 @@ endif ifeq ($(wildcard .git),) # not in git repository VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION | cut -d '-' -f 1) - I3_VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION) + I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)' else VERSION := $(shell git describe --tags --abbrev=0) I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")' -- 2.39.2