diff --git a/Makefile.am b/Makefile.am index 38e7a4ac..9866ab1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ CLEANFILES = $(doc_DATA) DISTCLEANFILES = $(pkgdoc_DATA) -EXTRA_DIST = AUTHORS BUGS ChangeLog NEWS README THANKS +EXTRA_DIST = AUTHORS BUGS ChangeLog LICENCE NEWS README THANKS AUTHORS.gz: $(top_srcdir)/AUTHORS -gzip -9 < $< > $@ @@ -43,7 +43,7 @@ THANKS.gz: $(top_srcdir)/THANKS local-clean: maintainer-clean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may need special tools to rebuild." - rm -f COPYING + rm -f LICENCE rm -f ChangeLog rm -f INSTALL rm -f acinclude.m4 diff --git a/NEWS b/NEWS index 603c43f9..165ac66f 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,8 @@ Apache CouchDB NEWS =================== -Version 0.7.3a1 ---------------- +Version 0.7.3a +-------------- This version is unreleased and only available from the source repository. diff --git a/bootstrap b/bootstrap index 17060957..47bc1054 100755 --- a/bootstrap +++ b/bootstrap @@ -29,7 +29,7 @@ CONFIG_GUESS_COMPRESSED_FILE="build-contrib/config.guess_2007-09-12.gz" CONFIG_GUESS_FILE="build-aux/config.guess" CONFIG_SUB_COMPRESSED_FILE="build-contrib/config.sub_2007-09-12.gz" CONFIG_SUB_FILE="build-aux/config.sub" -COPYING_FILE="COPYING" +LICENCE_FILE="LICENCE" LICENSE_COMPRESSED_FILE="build-contrib/apache_2.txt.gz" M4_DIRECTORY="m4" M4_AC_CHECK_ICU_FILE="m4/ac_check_icu.m4" @@ -192,8 +192,8 @@ generate_acinclude () { process_file_collection () { # Process files required to complete the bootstrap. - echo "Installing \`"$COPYING_FILE"'" - gzip --decompress --stdout $LICENSE_COMPRESSED_FILE > $COPYING_FILE + echo "Installing \`"$LICENCE_FILE"'" + gzip --decompress --stdout $LICENSE_COMPRESSED_FILE > $LICENCE_FILE echo "Installing \`"$BUILD_AUX_DIRECTORY"'" mkdir -p $BUILD_AUX_DIRECTORY echo "Installing \`"$CONFIG_GUESS_FILE"'" diff --git a/configure.ac b/configure.ac index e87ad84f..88fb5ab4 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([1.6.3 gnu check-news -Wno-portability]) +AM_INIT_AUTOMAKE([1.6.3 foreign check-news -Wno-portability]) AC_GNU_SOURCE AC_ENABLE_SHARED