+++ /dev/null
-#
-# Configure the location of the LLVM object root. We know it is two
-# directories up. The source tree location we do not know; let the LLVM
-# Makefiles find it for us.
-#
-LLVM_OBJ_ROOT=$(LEVEL)/../..
-
-#
-# Grab the LLVM configuration file.
-#
-include $(LEVEL)/../../Makefile.config
-
-#
-# Reconfigure the source directories
-#
-BUILD_SRC_ROOT:=$(LLVM_SRC_ROOT)/projects/sample
-BUILD_SRC_DIR := $(subst //,/,$(BUILD_SRC_ROOT)/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
-
-#
-# Include LLVM's build rules.
-#
-include $(LLVM_SRC_ROOT)/Makefile.rules
-
--- /dev/null
+#
+# Set this variable to the top of the LLVM source tree.
+#
+LLVM_SRC_ROOT = @LLVM_SRC@
+
+#
+# Set this variable to the top level directory where LLVM was built
+# (this is *not* the same as OBJ_ROOT as defined in LLVM's Makefile.config).
+#
+LLVM_OBJ_ROOT = @LLVM_OBJ@
+
+#
+# Include LLVM's Master Makefile.
+#
+include $(LLVM_OBJ_ROOT)/Makefile.config
+
+#
+# Set the source root and source directory pathnames
+#
+BUILD_SRC_DIR := $(subst //,/,@abs_top_srcdir@/$(patsubst $(BUILD_OBJ_ROOT)%,%,$(BUILD_OBJ_DIR)))
+
+BUILD_SRC_ROOT := $(subst //,/,@abs_top_srcdir@)
+
+#
+# Include LLVM's Master Makefile.
+#
+include $(LLVM_SRC_ROOT)/Makefile.rules
+
+++ /dev/null
-#
-# Set this variable to the top of the LLVM source tree.
-#
-LLVM_SRC_ROOT = $(LEVEL)/../..
-
-#
-# Set this variable to the top level directory where LLVM was built
-# (i.e. where all of the object files are located).
-#
-#LLVM_OBJ_ROOT = $(LEVEL)/../..
-
-#
-# Include LLVM's Makefile Makefile.
-#
-include $(LLVM_SRC_ROOT)/Makefile.config
-