summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-09-21 14:43:33 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2010-09-21 14:43:33 -0400
commit0364fb9588132b2e643854efcc59bfaca1fae735 (patch)
tree6c8a7d33f8236c03ffab0e821e56e2da7ddae5d0
parenta0baa965f55b7fcb1ea7efa46252cea933086086 (diff)
downloadpostgresql-0364fb9588132b2e643854efcc59bfaca1fae735.tar.gz
Back-patch replacement of README.CVS with README.git.
In older branches, also git-ify the "make distdir" rule.
-rw-r--r--GNUmakefile.in4
-rw-r--r--README.git (renamed from README.CVS)10
2 files changed, 7 insertions, 7 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 563532ab24..3eb8780170 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -92,7 +92,7 @@ postgresql-test-$(VERSION).tar: distdir
distdir:
-rm -rf $(distdir)* $(dummy)
- for x in `cd $(top_srcdir) && find . -name CVS -prune -o -print`; do \
+ for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
file=`expr X$$x : 'X\./\(.*\)'`; \
if test -d "$(top_srcdir)/$$file" ; then \
mkdir "$(distdir)/$$file" && chmod 777 "$(distdir)/$$file"; \
@@ -103,7 +103,7 @@ distdir:
done
$(MAKE) -C $(distdir) distprep
$(MAKE) -C $(distdir) distclean
- rm -f $(distdir)/README.CVS
+ rm -f $(distdir)/README.git
distcheck: $(distdir).tar.gz
-rm -rf $(dummy)
diff --git a/README.CVS b/README.git
index 37daaf6bc3..83b9a8c581 100644
--- a/README.CVS
+++ b/README.git
@@ -2,13 +2,13 @@
In a release or snapshot tarball of PostgreSQL, documentation files named
INSTALL and HISTORY will appear in this directory. However, these files are
-not stored in CVS and so will not be present if you are using a CVS checkout.
-If you are using CVS, you can view the most recent install instructions at:
+not stored in git and so will not be present if you are using a git checkout.
+If you are using git, you can view the most recent install instructions at:
http://developer.postgresql.org/docs/postgres/installation.html
and the current release notes at:
http://developer.postgresql.org/docs/postgres/release.html
-Users compiling from CVS will also need compatible versions of Bison and
-Flex, as discussed in the install documentation. Bison and Flex are not
+Users compiling from git will also need compatible versions of Bison, Flex,
+and Perl, as discussed in the install documentation. These programs are not
needed when using a tarball, since the files they are needed to build are
-already present in the tarball.
+already present in the tarball. (On Windows, however, you need Perl anyway.)