From 57700a3b7786411f63fdd7e510de45fc05ed9597 Mon Sep 17 00:00:00 2001
From: ian <ian>
Date: Sat, 16 Sep 2000 23:29:41 +0000
Subject: [PATCH] +  * Find install-sh properly when we need to use it, and
 chmod it +x.

@@ -16,6 +16,7 @@
+  * Find install-sh properly when we need to use it, and chmod it +x.
---
 INSTALL          | 13 ++++++++-----
 changelog        |  1 +
 settings.make.in |  8 +++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/INSTALL b/INSTALL
index bc4f0be..1054264 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,15 +18,18 @@ The following platforms have been tested at at least some point and
 should work - please report if they don't:
   [adns]       OS
    1.0		Linux glibc 2.1 (actually tested on Debian 2.2).
-   1.0		FreeBSD 3.2
+
    1.0		Solaris 2.6, 2.7, 2.8
+   1.0		FreeBSD 3.2, 4.0 (no poll(2), so no adnsresfilter)
+These appear to work, but only with --disable-dynamic:
+   1.0		IRIX 6.5 *not* with GCC [1], [2]
+   1.0		AIX 4.1.5
    1.0		HP-UX 10.20, 11.00
-   1.0		IRIX 6.5 *not* with GCC [1], --disable-dynamic, [2]
-   1.0		AIX 4.1.5, --disable-dynamic
+
 Later versions of the same OS should work too.  [adns] is the latest
 version of adns that has been tested.  Usually entries in this table
-mean they pass adns's own regression test, when compiled with GCC.
-Notes/known problems:
+mean they pass adns's own regression test, when compiled with GCC,
+and appear to install and run correctly.  Notes/known problems:
     [1] IRIX 6.5 inet_ntoa seems to break with GCC.
     [2] Many spurious warnings from this platform's native compiler.
 
diff --git a/changelog b/changelog
index fd50e56..b697575 100644
--- a/changelog
+++ b/changelog
@@ -16,6 +16,7 @@ adns (0.10) unstable; urgency=low
   * adnstest: setvbuf(stdout,...) before we do first output.
   * Cope with compilers that don't do `inline'.
   * Add and fix various missing system #includes.
+  * Find install-sh properly when we need to use it, and chmod it +x.
   * Do not use variadic macro, use stdarg instead (adnslogres.c).
   * Regression tests work even if some syscalls are already macros.
   * #include "config.h" before "adns.h".
diff --git a/settings.make.in b/settings.make.in
index f276a6a..8c19363 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -52,7 +52,13 @@ bin_dir=	$(exec_prefix)/bin
 lib_dir=	$(exec_prefix)/lib
 include_dir=	$(prefix)/include
 
-INSTALL=		@INSTALL@
+AC_INSTALL=	@INSTALL@
+ifeq ($(AC_INSTALL),./install-sh -c)
+INSTALL=	$(srcdir)/../$(AC_INSTALL)
+else
+INSTALL=	$(AC_INSTALL)
+endif
+
 INSTALL_PROGRAM=	$(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
 INSTALL_DATA=		$(INSTALL) -m 644
 
-- 
2.11.0