Collapse more clang version numbers down into fewer places.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81983 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e225eb..6ed32d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
# Clang version information
+# FIXME: get from a file called ./VER
set(CLANG_VERSION 1.1)
macro(add_clang_library name)
diff --git a/VER b/VER
new file mode 100644
index 0000000..9459d4b
--- /dev/null
+++ b/VER
@@ -0,0 +1 @@
+1.1
diff --git a/docs/tools/Makefile b/docs/tools/Makefile
index a1bbbcc..12696ef 100644
--- a/docs/tools/Makefile
+++ b/docs/tools/Makefile
@@ -21,6 +21,7 @@
DST_HTML_DIR=html/
DST_MAN_DIR=man/man1/
DST_PS_DIR=ps/
+CLANG_VERSION := trunk
# If we are in BUILD_FOR_WEBSITE mode, default to the all target.
all:: html man ps
@@ -39,6 +40,8 @@
LEVEL := ../../../..
include $(LEVEL)/Makefile.common
+CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+
SRC_DOC_DIR=$(PROJ_SRC_DIR)/
DST_HTML_DIR=$(PROJ_OBJ_DIR)/
DST_MAN_DIR=$(PROJ_OBJ_DIR)/
@@ -66,7 +69,7 @@
--podpath=. --infile=$< --outfile=$@ --title=$*
$(DST_MAN_DIR)%.1: %.pod $(DST_MAN_DIR)/.dir
- pod2man --release "clang 1.1" --center="Clang Tools Documentation" $< $@
+ pod2man --release "clang $(CLANG_VERSION)" --center="Clang Tools Documentation" $< $@
$(DST_PS_DIR)%.ps: $(DST_MAN_DIR)%.1 $(DST_PS_DIR)/.dir
groff -Tps -man $< > $@
diff --git a/lib/Headers/Makefile b/lib/Headers/Makefile
index 3abe149..cb36e84 100644
--- a/lib/Headers/Makefile
+++ b/lib/Headers/Makefile
@@ -10,8 +10,9 @@
LEVEL = ../../../..
include $(LEVEL)/Makefile.common
-# FIXME: Get version from a common place.
-HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.1/include
+CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+
+HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
@@ -25,7 +26,7 @@
# Hook into the standard Makefile rules.
all-local:: $(OBJHEADERS)
-PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/1.1/include
+PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
INSTHEADERS := $(addprefix $(PROJ_headers)/, $(HEADERS))
@@ -37,4 +38,3 @@
$(Echo) Installing compiler include file: $(notdir $<)
install-local:: $(INSTHEADERS)
-