diff options
| author | Francis Dupont <fdupont@isc.org> | 2017-12-21 19:00:05 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2017-12-21 19:00:05 +0100 |
| commit | 36d4e51a4d61af34760f7ead96a1bfb77e3076a9 (patch) | |
| tree | 0c19bd4a45bb1560b84c062f0651c7db19ce8613 | |
| parent | 17689a82ec1026da9d49fc57fd3e9ca27acf7ad9 (diff) | |
| download | isc-dhcp-36d4e51a4d61af34760f7ead96a1bfb77e3076a9.tar.gz | |
Merged rt43474 (before release tuning: -libisccc +uninstall)
| -rw-r--r-- | configure.ac+lt | 3 | ||||
| -rw-r--r-- | configure.ac-base | 3 | ||||
| -rw-r--r-- | util/Makefile.bind.in | 14 |
3 files changed, 13 insertions, 7 deletions
diff --git a/configure.ac+lt b/configure.ac+lt index 6fa7edba..e8c0b16a 100644 --- a/configure.ac+lt +++ b/configure.ac+lt @@ -854,8 +854,7 @@ fi DHLIBS=LTLIBRARIES A=la BINDLT="--with-libtool --disable-symtable" -# BIND does not provide uninstall -DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool --disable-bind-install" +DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool" AC_SUBST(DHLIBS) diff --git a/configure.ac-base b/configure.ac-base index 8cf37969..89d3fbff 100644 --- a/configure.ac-base +++ b/configure.ac-base @@ -867,8 +867,7 @@ fi DHLIBS=LTLIBRARIES A=la BINDLT="--with-libtool --disable-symtable" -# BIND does not provide uninstall -DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool --disable-bind-install" +DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool" @END WITH LIBTOOL @BEGIN WITHOUT LIBTOOL diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in index 02be6ace..bfb8bbf7 100644 --- a/util/Makefile.bind.in +++ b/util/Makefile.bind.in @@ -30,8 +30,7 @@ bindconfig = --without-openssl --without-libxml2 --without-libjson \ @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf cleanfiles = ./configure.log ./build.log ./install.log -# isccfg depends on isccc?! -bindlibs = isc dns isccc isccfg irs +bindlibs = isc dns isccfg irs installdirs = includedir=${binddir}/include libdir=${binddir}/lib @BIND_ATF_FALSE@all: bind1 bind2 @@ -106,7 +105,16 @@ install-bind: all $(MAKE) install) ; \ done +@INSTALL_BIND_FALSE@uninstall: +@INSTALL_BIND_TRUE@uninstall: uninstall-bind + +uninstall-bind: all + @for libdir in ${bindlibs} ; do \ + (cd ${bindsrcdir}/lib/$$libdir ; \ + $(MAKE) uninstall) ; \ + done + # Include the following so that this Makefile is happy when the parent # tries to use them. -check distdir distclean dvi installcheck uninstall: +check distdir distclean dvi installcheck: |