From 166c6e23b60b3b45843b5234ecf408b7bb281c69 Mon Sep 17 00:00:00 2001 From: Anssi Hannula <anssi.hannula@iki.fi> Date: Fri, 22 Jan 2010 22:10:00 +0200 Subject: [PATCH 3/3] driver: drop the use of CRYSTALHD_ROOT variable Use $(src) instead of defining a CRYSTALHD_ROOT variable at configure time. This allows the build to work even when moving the driver directory around. Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> --- driver/linux/Makefile.in | 3 +-- driver/linux/configure.ac | 3 --- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/driver/linux/Makefile.in b/driver/linux/Makefile.in index b8f731d..b6c305e 100644 --- a/driver/linux/Makefile.in +++ b/driver/linux/Makefile.in @@ -2,11 +2,10 @@ # Broadcom Crystal HD (BCM970012) controller Makefile. # # -CRYSTALHD_ROOT = @CRYSTALHDROOT@ KDIR = @KERN_DIR@ -INCLUDES = -I$(KDIR)/include -I$(CRYSTALHD_ROOT)/../../include -I$(CRYSTALHD_ROOT)/../../include/link +INCLUDES = -I$(KDIR)/include -I$(src)/../../include -I$(src)/../../include/link EXTRA_CFLAGS = -D__KERNEL__ -DMODULE $(INCLUDES) $(INC) EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -Werror -O2 diff --git a/driver/linux/configure.ac b/driver/linux/configure.ac index 6e8a2b6..5b89da7 100644 --- a/driver/linux/configure.ac +++ b/driver/linux/configure.ac @@ -5,9 +5,6 @@ AC_ARG_WITH(kernel-path, [ --with-kernel-path Specify kernel path], KERN_DIR=$withval, KERN_DIR="/lib/modules/"$(uname -r)"/build") -CRYSTALHDROOT="$(pwd)" - -AC_SUBST(CRYSTALHDROOT) AC_SUBST(KERN_DIR) AC_OUTPUT([ -- 1.6.4.4