diff options
130 files changed, 3620 insertions, 12528 deletions
diff --git a/.gitignore b/.gitignore index 8178a2214b..0772abe3ce 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ /.dir-locals.el # Top level excludes -/Makefile.bak +/Makefile.orig /Makefile /MINFO /TABLE @@ -22,6 +22,8 @@ /out.* /tmp.* +**/Makefile + /test/*.ss /test/*.srl /test/.rnd diff --git a/.travis-create-release.sh b/.travis-create-release.sh index 0404fc1248..a636606549 100644 --- a/.travis-create-release.sh +++ b/.travis-create-release.sh @@ -3,8 +3,8 @@ # $1 is expected to be $TRAVIS_OS_NAME if [ "$1" == osx ]; then - make -f Makefile.org \ + make -f Makefile.in \ DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist else - make -f Makefile.org DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist + make -f Makefile.in DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist fi @@ -4,6 +4,11 @@ Changes between 1.0.2e and 1.1.0 [xx XXX xxxx] + *) The distribution now has Makefile.in files, which are used to + create Makefile's when Configure is run. *Configure must be run + before trying to build now.* + [Rich Salz] + *) The return value for SSL_CIPHER_description() fo |