Complete #38754 for HP-UX [#39300]

2 files changed, 23 insertions, 18 deletions

diff --git a/RELNOTES b/RELNOTES
index 04fada63..3e32fae8 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -80,7 +80,7 @@ by Eric Young (eay@cryptsoft.com).
   can now be built from its embedded sources in bind, solving the
   atf-run / atf-report issue with recent (>= 0.20) versions of ATF.
   The new configuration option is "./configure --with-atf=bind".
-  [ISC-Bugs #38754]
+  [ISC-Bugs #38754, #39300]
 
 - Corrected a compilation error introduced by the fix for ISC-Bugs #22806.
   On older linuxes that do not include the tpacket_auxdata structure don't
diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in
index f972c71a..bd784c60 100644
--- a/util/Makefile.bind.in
+++ b/util/Makefile.bind.in
@@ -26,17 +26,20 @@ include ./bindvar.tmp
 
 bindsrcdir=bind-${version}
 
-bindconfig = --disable-kqueue --disable-epoll --disable-devpoll
-bindconfig += --without-openssl --without-libxml2 --enable-exportlib
-bindconfig += --enable-threads=no --with-export-includedir=${binddir}/include
-bindconfig += --with-export-libdir=${binddir}/lib --with-gssapi=no
-bindconfig += @BINDCONFIG@
-
-cleandirs = ./lib ./include
-@BIND_ATF_TRUE@cleandirs += ./atf
+bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \
+	--without-openssl --without-libxml2 --enable-exportlib \
+	--with-gssapi=no --enable-threads=no @BINDCONFIG@ \
+	--with-export-includedir=${binddir}/include \
+	--with-export-libdir=${binddir}/lib
+
+@BIND_ATF_FALSE@cleandirs = ./lib ./include
+@BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf
 cleanfiles = ./configure.log ./build.log ./install.log
 
-all:
+@BIND_ATF_FALSE@all: bind1 bind2
+@BIND_ATF_TRUE@all: bind1 atf bind2
+
+bind1:
 # Extract the source from the tarball, if it hasn't been already.
 	@if test -d ${bindsrcdir} ; then                    \
 		echo ${bindsrcdir} already unpacked... ;    \
@@ -64,16 +67,18 @@ all:
                  ./configure ${bindconfig} > ${binddir}/configure.log); \
 	fi
 
+atf:
 # Build and copy the ATF support if not yet installed.
-@BIND_ATF_TRUE@	@if test -d ./atf ; then				      \
-@BIND_ATF_TRUE@		echo ATF support already installed ;		      \
-@BIND_ATF_TRUE@	else							      \
-@BIND_ATF_TRUE@		echo Building ATF support ;			      \
-@BIND_ATF_TRUE@		(cd ${bindsrcdir}/unit;				      \
-@BIND_ATF_TRUE@		 MAKE=${GMAKE} ${GMAKE} atf > ${binddir}/build.log ;  \
-@BIND_ATF_TRUE@		 cp -rp atf ${binddir}) ;			      \
-@BIND_ATF_TRUE@	fi
+	@if test -d ./atf ; then				      \
+		echo ATF support already installed ;		      \
+	else							      \
+		echo Building ATF support ;			      \
+		(cd ${bindsrcdir}/unit;				      \
+		 MAKE=${GMAKE} ${GMAKE} atf > ${binddir}/build.log ;  \
+		 cp -rp atf ${binddir}) ;			      \
+	fi
 
+bind2:
 # Build and install the export libraries
 # No need to do anything if we already have something installed.
 	@if test -d ${binddir}/lib ; then                                    \