From 2a35d857b35c9d30d073e2372aa302cd999321ba Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 11 Jun 2008 12:20:56 -0700 Subject: Remove override of drm module list in preparation for merge. --- linux-core/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'linux-core/Makefile') diff --git a/linux-core/Makefile b/linux-core/Makefile index fc32676f..3af6f370 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -30,7 +30,6 @@ # # make DRM_MODULES="r128 radeon" # -DRM_MODULES=i915 SHELL=/bin/sh -- cgit v1.2.3 From f378319b5627d84ca821c8e6a9f2fee612119477 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 10 Jun 2008 17:53:32 -0700 Subject: Use /bin/pwd instead of trusting shell built-in --- linux-core/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux-core/Makefile') diff --git a/linux-core/Makefile b/linux-core/Makefile index 3af6f370..55dfb77c 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -116,7 +116,7 @@ V := $(shell if [ -f $(BOOTVERSION_PREFIX)version.h ]; then \ ifeq ($(V),"$(RUNNING_REL)") HEADERFROMBOOT := 1 -GETCONFIG := MAKEFILES=$(shell pwd)/.config +GETCONFIG := MAKEFILES=$(shell /bin/pwd)/.config HAVECONFIG := y endif @@ -163,7 +163,7 @@ endif all: modules modules: includes - +make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules + +make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`/bin/pwd` DRMSRCDIR=`/bin/pwd` modules ifeq ($(HEADERFROMBOOT),1) @@ -239,7 +239,7 @@ drmstat: drmstat.c $(CC) $(PRGCFLAGS) $< -o $@ $(DRMSTATLIBS) install: - make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`pwd` DRMSRCDIR=`pwd` modules_install + make -C $(LINUXDIR) $(GETCONFIG) SUBDIRS=`/bin/pwd` DRMSRCDIR=`/bin/pwd` modules_install else -- cgit v1.2.3