@@ -115,8 +115,8 @@ endif
do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools)))
# NVIDIA DKMS package gross series split into desktop and server.
-nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' debian/dkms-versions)
-nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' debian/dkms-versions)
+nvidia_desktop_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*\) .*/\1/p' $(DEBIAN)/dkms-versions)
+nvidia_server_series=$(shell sed -n -e 's/^nvidia-graphics-drivers-\([0-9][0-9]*-server\) .*/\1/p' $(DEBIAN)/dkms-versions)
# Debian Build System targets
binary: binary-indep binary-arch
@@ -292,7 +292,7 @@ all_dkms_modules =
subst_paired = $(subst $(firstword $(subst =, ,$(1))),$(lastword $(subst =, ,$(1))),$(2))
recursive_call = $(if $(2),$(call recursive_call,$(1),$(wordlist 2,$(words $(2)),$(2)),$(call $(1),$(firstword $(2)),$(3))),$(3))
-$(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DROOT)/dkms-versions), \
+$(foreach _line,$(shell gawk '{ OFS = "!"; $$1 = $$1; print }' $(DEBIAN)/dkms-versions), \
$(eval _params = $(subst !, ,$(_line))) \
$(eval _deb_pkgname = $(firstword $(_params))) \
$(eval _deb_version = $(word 2,$(_params))) \
@@ -64,4 +64,4 @@ do
-e "s#ARCH#$arch#g" \
-e "s#MODULE#$module#g" \
-e "s#FLAVOUR#$flavour#g"
-done <"debian/dkms-versions"
+done <"${DEBIAN}/dkms-versions"
BugLink: https://bugs.launchpad.net/bugs/2055685 debian/dkms-versions has moved to debian.<derivative>/dkms-versions Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com> --- debian/rules | 4 ++-- debian/rules.d/0-common-vars.mk | 2 +- debian/scripts/control-create | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)