Imported Upstream version 1.17.1upstream/1.17.1

Change-Id: Ifb18ec521bbeaf8bac560e0588657f136ca93e5d

1 files changed, 9 insertions, 17 deletions

diff --git a/maketgz b/maketgz
index e3bb77a..ec1ecea 100755
--- a/maketgz
+++ b/maketgz
@@ -7,7 +7,7 @@ if($version eq "") {
     exit;
 }
 
-if(!-f "ares.h") {
+if(!-f "include/ares.h") {
     print "run this script in the ares source root dir\n";
     exit;
 }
@@ -18,9 +18,9 @@ $major += 0;
 $minor += 0;
 $patch += 0;
 
-open(VER, "<ares_version.h") ||
-    die "can't open ares_version.h";
-open(NEWV, ">ares_version.h.dist");
+open(VER, "<include/ares_version.h") ||
+    die "can't open include/ares_version.h";
+open(NEWV, ">include/ares_version.h.dist");
 while(<VER>) {
     $_ =~ s/^\#define ARES_VERSION_MAJOR .*/\#define ARES_VERSION_MAJOR $major/;
     $_ =~ s/^\#define ARES_VERSION_MINOR .*/\#define ARES_VERSION_MINOR $minor/;
@@ -31,7 +31,7 @@ while(<VER>) {
 }
 close(VER);
 close(NEWV);
-print "ares_version.h.dist created\n";
+print "include/ares_version.h.dist created\n";
 
 if(!-f "configure") {
     print "running buildconf\n";
@@ -40,6 +40,9 @@ if(!-f "configure") {
 print "adding $version in the configure.ac file\n";
 `sed -e 's/AC_INIT.*/AC_INIT([c-ares], [$version],/' < configure.ac > configure.ac.dist`;
 
+print "adding $version in the CMakeLists.txt file\n";
+`sed -e 's/SET.*CARES_VERSION.*/SET (CARES_VERSION "$version")/' < CMakeLists.txt > CMakeLists.txt.dist && rm -f CMakeLists.txt && mv CMakeLists.txt.dist CMakeLists.txt`;
+
 # now make a new configure script with this
 print "makes a new configure script\n";
 `autoconf configure.ac.dist >configure`;
@@ -48,17 +51,6 @@ print "makes a new configure script\n";
 print "running configure\n";
 `./configure`;
 
-# generate HTML versions of man pages
-# Deactivated for now. It seems that man pages need some adjustments
-# relative to paragraph and/or line breaks for proper html formatting.
-# EXTRA_DIST will need $(HTMLPAGES) when this is fully activated.
-# print "running make html\n";
-# `make -s html`;
-
-# generate PDF versions of man pages
-print "running make pdf\n";
-`make -s pdf`;
-
 print "produce CHANGES\n";
 `git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./git2changes.pl > CHANGES.dist`;
 
@@ -72,6 +64,6 @@ print "running make dist\n";
 print "removing temporary configure.ac file\n";
 `rm configure.ac.dist`;
 print "removing temporary ares_version.h file\n";
-`rm ares_version.h.dist`;
+`rm include/ares_version.h.dist`;
 
 print "NOTE: now tag this release!\n";