diff options
Diffstat (limited to 'bind')
| -rw-r--r-- | bind/Makefile | 40 | ||||
| -rw-r--r-- | bind/bind.tar.gz | bin | 8462576 -> 6999374 bytes | |||
| -rw-r--r-- | bind/version.tmp | 8 |
3 files changed, 31 insertions, 17 deletions
diff --git a/bind/Makefile b/bind/Makefile index 030759c..0fb676f 100644 --- a/bind/Makefile +++ b/bind/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2010 by Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2009-2012 by Internet Systems Consortium, Inc. ("ISC") # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.bind,v 1.2.2.7 2011-04-06 22:00:40 marka Exp $ +# $Id: Makefile.bind,v 1.2.2.8 2012-04-05 22:17:08 sar Exp $ # Configure and build the bind libraries for use by DHCP @@ -44,18 +44,31 @@ all: # Configure the export libraries # Currently disable the epoll and devpoll options as they don't interact # well with the DHCP code. - @echo Configuring BIND Export libraries for DHCP. - @(cd ${bindsrcdir} && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log) - -# Build the export libraries - @echo Building BIND Export libraries - this takes some time. - @(cd ${bindsrcdir}/lib/export ; \ - echo building in `pwd` ; \ - MAKE=${GMAKE} ${GMAKE} > ${binddir}/build.log) +# If the top-level Bind Makefile exists we skip the configuration step +# as we assume it's done and won't change. Doing a make clean will +# reset things if necessary. + @if test -f ${bindsrcdir}/Makefile ; then \ + echo Bind export libraries already configured ; \ + else \ + echo Configuring BIND Export libraries for DHCP. ; \ + rm -rf ./lib ./include ./configure.log ./build.log ./install.log ; \ + (cd ${bindsrcdir} && ./configure --disable-kqueue --disable-epoll --disable-devpoll --without-openssl --without-libxml2 --enable-exportlib --enable-threads=no --with-export-includedir=${binddir}/include --with-export-libdir=${binddir}/lib --with-gssapi=no > ${binddir}/configure.log); \ + fi - @echo Installing BIND Export libraries to ${binddir}. - @(cd ${bindsrcdir}/lib/export ; \ - MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) +# Build and install the export libraries +# No need to do anything if we already have something installed. + @if test -d ${binddir}/lib ; then \ + echo Bind export libraries already installed ; \ + else \ + echo Building BIND Export libraries - this takes some time. ;\ + (cd ${bindsrcdir}/lib/export ; \ + echo building in `pwd` ; \ + MAKE=${GMAKE} ${GMAKE} > ${binddir}/build.log) ; \ + \ + echo Installing BIND Export libraries to ${binddir}. ; \ + (cd ${bindsrcdir}/lib/export ; \ + MAKE=${GMAKE} ${GMAKE} install > ${binddir}/install.log) ; \ + fi clean: @echo Cleaning BIND export library. @@ -73,3 +86,4 @@ install: check: +uninstall: diff --git a/bind/bind.tar.gz b/bind/bind.tar.gz Binary files differindex 040ba04..2275b24 100644 --- a/bind/bind.tar.gz +++ b/bind/bind.tar.gz diff --git a/bind/version.tmp b/bind/version.tmp index 249750e..aa5d40c 100644 --- a/bind/version.tmp +++ b/bind/version.tmp @@ -1,10 +1,10 @@ -# $Id: version,v 1.53.8.9.6.1 2011-11-16 09:32:07 marka Exp $ +# $Id$ # # This file must follow /bin/sh rules. It is imported directly via # configure. # MAJORVER=9 MINORVER=8 -PATCHVER=1 -RELEASETYPE=-P -RELEASEVER=1 +PATCHVER=2 +RELEASETYPE= +RELEASEVER= |