From 9ae0e5e8a515d4e225a895809de32ed83fc413da Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Mon, 5 Feb 2018 16:43:35 +0100 Subject: Make a README from README.md when running 'make dist' (#772) Make a README from README.md when running 'make dist'. README.md is stripped from the CI status images that is displayed on GitHub, but other README is just a copy of README.md. Adjusted travis/install.sh so that 'make dist-all' is not run on the source distribution. --- .gitignore | 1 + Makefile.am | 5 +++++ travis/install.sh | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e191b441..50314ae9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ CTestTestfile.cmake cmake_install.cmake install_manifest.txt cmake/project-config*.cmake +README /.vs* /*.manifest diff --git a/Makefile.am b/Makefile.am index 7b38aaf9..f4a82f9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,4 +8,9 @@ pkgconfig_DATA = proj.pc AUTOMAKE_OPTIONS = dist-zip ACLOCAL_AMFLAGS = -I m4 + README: README.md + fgrep -v "[![" $< > $@ + +clean-local: + $(RM) README diff --git a/travis/install.sh b/travis/install.sh index 8b7a7b90..a12de9c6 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -38,7 +38,6 @@ cd $TAR_DIRECTORY ./configure --prefix=/tmp/proj_autoconf_install_from_dist_all make -j3 make install -make dist-all PROJ_LIB=$GRIDDIR make check CURRENT_PWD=`pwd` cd /tmp/proj_autoconf_install -- cgit v1.2.3