From 134632bb45baceb069ceec90c16c32788a7b7630 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 8 Oct 2012 16:22:31 -0700 Subject: [PATCH] Don't set the VPATH. Breaks the linux build On linux this causes make to see the 'servo' rule as targeting the src/servo directory, which is always up to date. servo never gets built --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 692bdc488b1..1d25869c8ea 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ endif S := $(CFG_SRC_DIR) B := $(CFG_BUILD_DIR) -VPATH := $(S)src +#VPATH := $(S)src # Delete the built-in rules. .SUFFIXES: @@ -153,7 +153,7 @@ ifeq ($(OSTYPE),darwin) package: servo mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa mkdir -p Servo.app/Contents/MacOS/src/rust-azure - cp $(VPATH)/Info.plist Servo.app/Contents/ + cp $(S)/Info.plist Servo.app/Contents/ cp servo Servo.app/Contents/MacOS/ cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/ cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/