X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=Makefile.in;h=976a1595d3cc70c3ebc5b5da01ff9de98457d81d;hp=dd55a3dfd4b04fc24345b515d98973a56f47fdb8;hb=HEAD;hpb=3212d4ff1f32821483c1c8f2fd592666a83050f1;ds=sidebyside

diff --git a/Makefile.in b/Makefile.in
index dd55a3d..bc1a0b2 100644
--- 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
@@ -24,7 +20,7 @@ include		./common.make
 
 # Remember to change ADNS_VERSION_STRING in client/client.h too, and
 # possibly library soname (MAJOR and MINOR in common.make.in).
-DISTVERSION=	1.5.0~rc1~
+DISTVERSION=	1.6.1
 
 srcdir=		@srcdir@
 VPATH=		@srcdir@
@@ -51,7 +47,8 @@ clean-here mostlyclean-here:
 		rm -rf dist_tmp web adnshost.txt
 
 distclean-here maintainer-clean-here:	clean-here
-	rm -f settings.make config.cache config.log config.status Makefile
+	rm -f settings.make common.make
+	rm -f config.cache config.log config.status Makefile
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM_FLAGS=-s
@@ -74,10 +71,10 @@ adnshost.txt: all
 
 web-install: adnshost.txt
 	test -e $(WEBDIR) || mkdir $(WEBDIR)
-	$(INSTALL_DATA) $(srcdir)/README.html $(WEBDIR)/
-	$(INSTALL_DATA) $(srcdir)/src/adns.h $(WEBDIR)/adns.h.txt
-	$(INSTALL_DATA) COPYING $(WEBDIR)/COPYING.txt
-	$(INSTALL_DATA) adnshost.txt $(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