From ad5f2b013459dc63d98aee4b0533e5c4d1b14878 Mon Sep 17 00:00:00 2001 From: David Ward Date: Sun, 25 Mar 2018 19:04:11 -0400 Subject: Include appropriate file from ChangeLogs directory in Debian packages Use the ACE version number to determine the file in the ChangeLogs directory to install in Debian packages. (The variable definitions are copied from ACE/include/makeinclude/wrapper_macros.GNU for the non-Windows case.) --- ACE/debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ACE/debian/rules b/ACE/debian/rules index 0a8a196a7ac..2bc9510ec4f 100755 --- a/ACE/debian/rules +++ b/ACE/debian/rules @@ -36,6 +36,10 @@ export ACE_ROOT := $(shell pwd) export MPC_ROOT := $(ACE_ROOT)/MPC export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib +ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) +ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) +ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) + %: dh $@ @@ -95,7 +99,8 @@ override_dh_installchangelogs: dh_installchangelogs -pace-gperf -pgperf-ace apps/gperf/ChangeLog dh_installchangelogs -pmpc-ace MPC/ChangeLog dh_installchangelogs $(addprefix -p,$(ALL_ACEXML)) ACEXML/ChangeLog - dh_installchangelogs --remaining-packages ChangeLogs/ACE-6_4_7 + dh_installchangelogs --remaining-packages \ + ChangeLogs/ACE-$(ACE_MAJOR_VERSION)_$(ACE_MINOR_VERSION)_$(ACE_MICRO_VERSION) override_dh_fixperms: ifneq (,$(filter libace-doc, $(shell dh_listpackages))) -- cgit v1.2.1