# HG changeset patch # User John W. Eaton # Date 1508515918 14400 # Fri Oct 20 12:11:58 2017 -0400 # Node ID 96de175d12509d371bdf17390617d3e401b51dee # Parent c4dac7a0da7e1e957a47df126d829059968b6ef7 use markdown for README and etc/HACKING files * README.md: Rename from README. * etc/HACKING.md: Rename from etc/HACKING. * Makefile.am (README): New dummy rule. (EXTRA_DIST): Update list. * configure.ac: Delete "foreign" from list of automake options. * bootstrap.conf: Check for README.md, not README. diff --git a/Makefile.am b/Makefile.am --- a/Makefile.am +++ b/Makefile.am @@ -120,7 +120,7 @@ EXTRA_DIST += \ COPYING \ INSTALL \ NEWS \ - README \ + README.md \ run-octave.in \ $(BUILT_DISTFILES) @@ -343,6 +343,13 @@ nonexistent-file: $(AM_V_at)rm -f bits/stl_algo.h .PHONY: nonexistent-file +## We have README.md, not README. This dummy rule prevents automake +## from complaining that we are not following the GNU coding standards. +## We don't generate README from README.md since it is probably more +## confusing to have both than to just have README.md. + +README: README.md + .gdbinit: etc/gdbinit @$(gdbinit_install_rule) diff --git a/README b/README.md rename from README rename to README.md diff --git a/bootstrap.conf b/bootstrap.conf --- a/bootstrap.conf +++ b/bootstrap.conf @@ -174,7 +174,7 @@ bootstrap_post_import_hook () ## with building the rest of Octave, and INSTALL, which is linked from ## gnulib/doc/INSTALL by the bootstrap script. - for f in NEWS README COPYING CITATION; do + for f in NEWS README.md COPYING CITATION; do if ! test -f $f; then echo "required file $f is missing" 2>&1 exit 1 diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,7 @@ AC_CONFIG_HEADERS([config.h:config.in.h] AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.14 foreign -Wno-portability -Wno-override tar-ustar subdir-objects dist-lzip dist-xz]) +AM_INIT_AUTOMAKE([1.14 -Wno-portability -Wno-override tar-ustar subdir-objects dist-lzip dist-xz]) ## Add the option to enable silent rules and make silent rules the ## default behavior. Available since Automake 1.11 and included by diff --git a/etc/HACKING b/etc/HACKING.md rename from etc/HACKING rename to etc/HACKING.md --- a/etc/HACKING +++ b/etc/HACKING.md @@ -342,12 +342,6 @@ An overview of the directory layout of O fntests.m script to run function tests embedded in C++ and .m files ----- -John W. Eaton address@hidden - -Last updated: Thu, 26 Jan 2017 08:29:19 EST - ################################################################################