mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 14:55:30 +00:00
Code Issues Releases Wiki Activity

Merged rt43474 (before release tuning: -libisccc +uninstall)

Browse Source
This commit is contained in:
Francis Dupont
2017-12-21 19:00:05 +01:00
parent 17689a82ec
commit 36d4e51a4d
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac+lt
View File

@@ -854,8 +854,7 @@ fi
DHLIBS=LTLIBRARIES DHLIBS=LTLIBRARIES
A=la A=la
BINDLT="--with-libtool --disable-symtable" BINDLT="--with-libtool --disable-symtable"
# BIND does not provide uninstall DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool"
DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool --disable-bind-install"
AC_SUBST(DHLIBS) AC_SUBST(DHLIBS)

3
configure.ac-base
View File

@@ -867,8 +867,7 @@ fi
DHLIBS=LTLIBRARIES DHLIBS=LTLIBRARIES
A=la A=la
BINDLT="--with-libtool --disable-symtable" BINDLT="--with-libtool --disable-symtable"
# BIND does not provide uninstall DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool"
DISTCHECK_LIBTOOL_CONFIGURE_FLAG="--enable-libtool --disable-bind-install"
@END WITH LIBTOOL @END WITH LIBTOOL
@BEGIN WITHOUT LIBTOOL @BEGIN WITHOUT LIBTOOL

14
util/Makefile.bind.in
View File

@@ -30,8 +30,7 @@ bindconfig = --without-openssl --without-libxml2 --without-libjson \
@BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf
cleanfiles = ./configure.log ./build.log ./install.log cleanfiles = ./configure.log ./build.log ./install.log
# isccfg depends on isccc?! bindlibs = isc dns isccfg irs
bindlibs = isc dns isccc isccfg irs
installdirs = includedir=${binddir}/include libdir=${binddir}/lib installdirs = includedir=${binddir}/include libdir=${binddir}/lib
@BIND_ATF_FALSE@all: bind1 bind2 @BIND_ATF_FALSE@all: bind1 bind2
@@ -106,7 +105,16 @@ install-bind: all
$(MAKE) install) ; \ $(MAKE) install) ; \
done 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 # Include the following so that this Makefile is happy when the parent
# tries to use them. # tries to use them.
check distdir distclean dvi installcheck uninstall: check distdir distclean dvi installcheck: