Fix typo in changelog entry for 1.6.1

[adns.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7f6592407106bcffadf4fac5844cd75e7700c3ab..bc1a0b2bd1a321ce58984aabddd27a4362f848c9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,7 @@
 # Makefile[.in] - top-level Makefile
 #  
-#  This file is part of adns, which is
-#    Copyright (C) 1997-2000,2003,2006,2014  Ian Jackson
-#    Copyright (C) 2014  Mark Wooding
-#    Copyright (C) 1999-2000,2003,2006  Tony Finch
-#    Copyright (C) 1991 Massachusetts Institute of Technology
-#  (See the file INSTALL for full details.)
+#  This file is part of adns, which is Copyright Ian Jackson
+#  and contributors (see the file INSTALL for full details).
 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,9 +16,11 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation.
 
+include                ./common.make
+
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
-# possibly library soname (MAJOR and MINOR in settings.make.in).
-DISTVERSION=   1.5.0~~
+# possibly library soname (MAJOR and MINOR in common.make.in).
+DISTVERSION=   1.6.1
 
 srcdir=                @srcdir@
 VPATH=         @srcdir@
@@ -34,6 +32,8 @@ else
 SUBDIRS_DYNAMIC=
 endif
 
+WEBDIR=web
+
 SUBDIRS= src $(SUBDIRS_DYNAMIC) client regress
 
 all install uninstall clean distclean mostlyclean maintainer-clean distprep:
@@ -44,10 +44,11 @@ all-here install-here uninstall-here distprep-here: README
 
 clean-here mostlyclean-here:
                rm -f *~ ./#*# core *.orig *.rej adns-*.tar.gz
-               rm -rf dist_tmp
+               rm -rf dist_tmp web adnshost.txt
 
 distclean-here maintainer-clean-here:  clean-here
-               rm -f settings.make config.h config.cache config.log config.status
+       rm -f settings.make common.make
+       rm -f config.cache config.log config.status Makefile
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM_FLAGS=-s
@@ -65,6 +66,16 @@ dist:                        distprep
        gzip -9 $(dist_tmp).tar
        mv $(dist_tmp).tar.gz .
 
+adnshost.txt: all
+       client/adnshost_s --help >$@.tmp && mv -f $@.tmp $@
+
+web-install: adnshost.txt
+       test -e $(WEBDIR) || mkdir $(WEBDIR)
+       $(INSTALL_DATA) $(srcdir)/README.html $(DESTDIR)$(WEBDIR)/
+       $(INSTALL_DATA) $(srcdir)/src/adns.h $(DESTDIR)$(WEBDIR)/adns.h.txt
+       $(INSTALL_DATA) COPYING $(DESTDIR)$(WEBDIR)/COPYING.txt
+       $(INSTALL_DATA) adnshost.txt $(DESTDIR)$(WEBDIR)/
+
 check:                 all
        $(MAKE) -C regress check