From 7d90293de344205a24969b291f5c0615f2303071 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 21 Feb 2016 16:32:09 +0000 Subject: [PATCH] Adjust VPATH to work for check-hyperv (and simplify the modpost wrapper) --- debian/rules.d/Makefile.inc | 2 +- debian/rules.d/scripts/mod/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/Makefile.inc b/debian/rules.d/Makefile.inc index acdcf71cd..a79e85b95 100644 --- a/debian/rules.d/Makefile.inc +++ b/debian/rules.d/Makefile.inc @@ -1,7 +1,7 @@ # Normalise OUTDIR to avoid triggering rebuilds override OUTDIR := $(patsubst ./%,%,$(OUTDIR)) -VPATH = $(top_srcdir)/$(OUTDIR) +VPATH = $(top_rulesdir)/$(OUTDIR) $(top_srcdir)/$(OUTDIR) SHELL = /bin/sh -e diff --git a/debian/rules.d/scripts/mod/Makefile b/debian/rules.d/scripts/mod/Makefile index 728afaa3b..e57e262aa 100644 --- a/debian/rules.d/scripts/mod/Makefile +++ b/debian/rules.d/scripts/mod/Makefile @@ -18,5 +18,5 @@ modpost.real-%: modpost-opts.h: $(top_srcdir)/scripts/mod/modpost.c python $(wrapperdir)/gendef.py $< > $@ -modpost.o: $(wrapperdir)/modpost.c modpost-opts.h +modpost.o: modpost.c modpost-opts.h $(CC) $(CFLAGS) -I $(CURDIR) -c -o $@ $<