From 80c7bfb069f69e1df5bd3e4bc234ed052f8d8e62 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 17 Jan 2012 16:49:44 -0800
Subject: [PATCH] Rename some readmes and fix some dist logic.

---
 Makefile.in                     |  4 +++-
 README => README.txt            |  0
 mk/dist.mk                      | 17 +++++++++--------
 src/{README => README.txt}      |  0
 src/comp/{README => README.txt} |  0
 5 files changed, 12 insertions(+), 9 deletions(-)
 rename README => README.txt (100%)
 rename src/{README => README.txt} (100%)
 rename src/comp/{README => README.txt} (100%)

diff --git a/Makefile.in b/Makefile.in
index abe2359b315..55c5c43ceb6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,9 @@ LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_VERSION = prerelease
+CFG_RELEASE = prerelease
+CFG_VERSION = $(CFG_RELEASE)
+
 ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)
     CFG_VERSION += $(shell git --git-dir=$(CFG_GIT_DIR) log -1 \
diff --git a/README b/README.txt
similarity index 100%
rename from README
rename to README.txt
diff --git a/mk/dist.mk b/mk/dist.mk
index fecdede796b..4783cd6050d 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -2,10 +2,8 @@
 # Distribution
 ######################################################################
 
-
 PKG_NAME := rust
-PKG_VER  = $(shell date +"%Y-%m-%d")-snap
-PKG_DIR = $(PKG_NAME)-$(PKG_VER)
+PKG_DIR = $(PKG_NAME)-$(CFG_RELEASE)
 PKG_TAR = $(PKG_DIR).tar.gz
 
 ifdef CFG_MAKENSIS
@@ -26,11 +24,11 @@ PKG_GITMODULES := \
     $(PKG_LLVM_SKEL)
 
 PKG_FILES = \
-    $(S)LICENSE.txt $(S)README                 \
+    $(S)LICENSE.txt $(S)README.txt             \
     $(S)configure $(S)Makefile.in              \
     $(S)/doc                                   \
     $(addprefix $(S)src/,                      \
-      README                                   \
+      README.txt                               \
       cargo                                    \
       comp                                     \
       compiletest                              \
@@ -46,9 +44,6 @@ PKG_FILES = \
     $(PKG_GITMODULES)                          \
     $(MKFILE_DEPS)
 
-dist: $(PKG_TAR) $(PKG_EXE)
-
-nsis-dist: $(PKG_EXE)
 
 lic.txt: $(S)LICENSE.txt
 	@$(call E, crlf: $@)
@@ -67,6 +62,12 @@ $(PKG_TAR): $(PKG_FILES)
 	$(Q)tar -czf $(PKG_TAR) -C dist $(PKG_DIR)
 	$(Q)rm -Rf dist
 
+.PHONY: dist nsis-dist distcheck
+
+dist: $(PKG_TAR) $(PKG_EXE)
+
+nsis-dist: $(PKG_EXE)
+
 distcheck: $(PKG_TAR)
 	$(Q)rm -Rf dist
 	$(Q)mkdir -p dist
diff --git a/src/README b/src/README.txt
similarity index 100%
rename from src/README
rename to src/README.txt
diff --git a/src/comp/README b/src/comp/README.txt
similarity index 100%
rename from src/comp/README
rename to src/comp/README.txt