From d1c220c506044bbc4a3475bd7dd5303dc1b85f99 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 19 Dec 2011 16:48:21 +0000 Subject: [PATCH] integrate package version into dkms module as well --- debian/dkms.conf.in | 2 +- kernel-module/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/dkms.conf.in b/debian/dkms.conf.in index 63eeeb87e..876955f67 100644 --- a/debian/dkms.conf.in +++ b/debian/dkms.conf.in @@ -1,6 +1,6 @@ PACKAGE_NAME="ngcp-mediaproxy-ng" PACKAGE_VERSION="__VERSION__" -MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build" +MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build MEDIAPROXY_VERSION=\"__VERSION__\"" CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean" AUTOINSTALL=yes BUILT_MODULE_NAME[0]="xt_MEDIAPROXY" diff --git a/kernel-module/Makefile b/kernel-module/Makefile index 9a757e163..bbc9b55f9 100644 --- a/kernel-module/Makefile +++ b/kernel-module/Makefile @@ -1,7 +1,8 @@ PWD := $(shell pwd) KSRC ?= /lib/modules/$(shell uname -r)/build KBUILD := $(KSRC) -EXTRA_CFLAGS += -DMEDIAPROXY_VERSION="\"$(shell dpkg-parsechangelog -l$(M)/../debian/changelog | awk '/^Version: / {print $$2}')\"" +MEDIAPROXY_VERSION = $(shell dpkg-parsechangelog -l$(M)/../debian/changelog | awk '/^Version: / {print $$2}') +EXTRA_CFLAGS += -DMEDIAPROXY_VERSION="\"$(MEDIAPROXY_VERSION)\"" obj-m += xt_MEDIAPROXY.o