Adam Tkac 9b81ef
diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
Adam Tkac 7a1646
--- bind-9.7.2-P2/isc-config.sh.in.exportlib	2007-06-20 01:46:59.000000000 +0200
Adam Tkac 7a1646
+++ bind-9.7.2-P2/isc-config.sh.in	2010-10-20 14:05:25.423861548 +0200
Adam Tkac 9b81ef
@@ -20,6 +20,8 @@
Adam Tkac 9b81ef
 prefix=@prefix@
Adam Tkac 9b81ef
 exec_prefix=@exec_prefix@
Adam Tkac 9b81ef
 exec_prefix_set=
Adam Tkac 9b81ef
+libdir=@libdir@
Adam Tkac 9b81ef
+includedir=@includedir@
Adam Tkac 9b81ef
 
Adam Tkac 9b81ef
 usage()
Adam Tkac 9b81ef
 {
Adam Tkac 9b81ef
@@ -115,14 +117,14 @@ if test x"$echo_exec_prefix" = x"true" ;
Adam Tkac 9b81ef
 	echo $exec_prefix
Adam Tkac 9b81ef
 fi
Adam Tkac 9b81ef
 if test x"$echo_cflags" = x"true"; then
Adam Tkac 9b81ef
-	includes="-I${exec_prefix}/include"
Adam Tkac 9b81ef
+	includes="-I${includedir}"
Adam Tkac 9b81ef
 	if test x"$libisc" = x"true"; then
Adam Tkac 9b81ef
 		includes="$includes @ALWAYS_DEFINES@ @STD_CINCLUDES@ @STD_CDEFINES@ @CCOPT@"
Adam Tkac 9b81ef
 	fi
Adam Tkac 9b81ef
 	echo $includes
Adam Tkac 9b81ef
 fi
Adam Tkac 9b81ef
 if test x"$echo_libs" = x"true"; then
Adam Tkac 9b81ef
-	libs=-L${exec_prefix}/lib
Adam Tkac 9b81ef
+	libs="-L${libdir}"
Adam Tkac 9b81ef
 	if test x"$liblwres" = x"true" ; then
Adam Tkac 9b81ef
 		libs="$libs -llwres"
Adam Tkac 9b81ef
 	fi
Adam Tkac 7a1646
diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/export/dns/Makefile.in
Adam Tkac 7a1646
--- bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib	2010-06-10 01:49:43.000000000 +0200
Adam Tkac 7a1646
+++ bind-9.7.2-P2/lib/export/dns/Makefile.in	2010-10-20 14:08:58.123772859 +0200
Adam Tkac 7a1646
@@ -35,9 +35,9 @@ CDEFINES =	-DUSE_MD5 @USE_OPENSSL@ @USE_
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 CWARNINGS =
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-ISCLIBS =	../isc/libisc.@A@
Adam Tkac 7a1646
+ISCLIBS =	../isc/libisc-export.@A@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-ISCDEPLIBS =	../isc/libisc.@A@
Adam Tkac 7a1646
+ISCDEPLIBS =	../isc/libisc-export.@A@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 LIBS =		@LIBS@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
@@ -114,29 +114,29 @@ version.@O@: ${srcdir}/version.c
Adam Tkac 7a1646
 		-DLIBAGE=${LIBAGE} \
Adam Tkac 7a1646
 		-c ${srcdir}/version.c
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libdns.@SA@: ${OBJS}
Adam Tkac 7a1646
+libdns-export.@SA@: ${OBJS}
Adam Tkac 7a1646
 	${AR} ${ARFLAGS} $@ ${OBJS}
Adam Tkac 7a1646
 	${RANLIB} $@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libdns.la: ${OBJS}
Adam Tkac 7a1646
+libdns-export.la: ${OBJS}
Adam Tkac 7a1646
 	${LIBTOOL_MODE_LINK} \
Adam Tkac 7a1646
-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la \
Adam Tkac 7a1646
+		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-export.la \
Adam Tkac 7a1646
 		-rpath ${export_libdir} \
Adam Tkac 7a1646
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
Adam Tkac 7a1646
 		${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-timestamp: libdns.@A@
Adam Tkac 7a1646
+timestamp: libdns-export.@A@
Adam Tkac 7a1646
 	touch timestamp
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 installdirs:
Adam Tkac 7a1646
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 install:: timestamp installdirs
Adam Tkac 7a1646
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ \
Adam Tkac 2ccdf6
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export.@A@ \
Adam Tkac 86c080
 	${DESTDIR}${export_libdir}/
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 clean distclean::
Adam Tkac 7a1646
-	rm -f libdns.@A@ timestamp
Adam Tkac 7a1646
+	rm -f libdns-export.@A@ timestamp
Adam Tkac 7a1646
 	rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
Adam Tkac 7a1646
 	rm -f include/dns/rdatastruct.h
Adam Tkac 7a1646
 
Adam Tkac 7a1646
diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/export/irs/Makefile.in
Adam Tkac 7a1646
--- bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib	2009-12-06 00:31:40.000000000 +0100
Adam Tkac 7a1646
+++ bind-9.7.2-P2/lib/export/irs/Makefile.in	2010-10-20 14:10:39.893717488 +0200
Adam Tkac 7a1646
@@ -42,9 +42,9 @@ SRCS =		context.c \
Adam Tkac 7a1646
 		gai_sterror.c getaddrinfo.c getnameinfo.c \
Adam Tkac 7a1646
 		resconf.c
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-ISCLIBS =	../isc/libisc.@A@
Adam Tkac 7a1646
-DNSLIBS =	../dns/libdns.@A@
Adam Tkac 7a1646
-ISCCFGLIBS =	../isccfg/libisccfg.@A@
Adam Tkac 7a1646
+ISCLIBS =	../isc/libisc-export.@A@
Adam Tkac 7a1646
+DNSLIBS =	../dns/libdns-export.@A@
Adam Tkac 7a1646
+ISCCFGLIBS =	../isccfg/libisccfg-export.@A@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 LIBS =		@LIBS@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
@@ -61,26 +61,26 @@ version.@O@: ${srcdir}/version.c
Adam Tkac 7a1646
 		-DLIBAGE=${LIBAGE} \
Adam Tkac 7a1646
 		-c ${srcdir}/version.c
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libirs.@SA@: ${OBJS} version.@O@
Adam Tkac 7a1646
+libirs-export.@SA@: ${OBJS} version.@O@
Adam Tkac 7a1646
 	${AR} ${ARFLAGS} $@ ${OBJS} version.@O@
Adam Tkac 7a1646
 	${RANLIB} $@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libirs.la: ${OBJS} version.@O@
Adam Tkac 7a1646
+libirs-export.la: ${OBJS} version.@O@
Adam Tkac 7a1646
 	${LIBTOOL_MODE_LINK} \
Adam Tkac 7a1646
-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la \
Adam Tkac 7a1646
+		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs-export.la \
Adam Tkac 7a1646
 		-rpath ${export_libdir} \
Adam Tkac 7a1646
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
Adam Tkac 7a1646
 		${OBJS} version.@O@ ${LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-timestamp: libirs.@A@
Adam Tkac 7a1646
+timestamp: libirs-export.@A@
Adam Tkac 7a1646
 	touch timestamp
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 installdirs:
Adam Tkac 7a1646
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 install:: timestamp installdirs
Adam Tkac 7a1646
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ \
Adam Tkac 2ccdf6
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libirs-export.@A@ \
Adam Tkac 86c080
 	${DESTDIR}${export_libdir}/
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 clean distclean::
Adam Tkac 7a1646
-	rm -f libirs.@A@ libirs.la timestamp
Adam Tkac 7a1646
+	rm -f libirs-export.@A@ libirs-export.la timestamp
Adam Tkac 7a1646
diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isccfg/Makefile.in
Adam Tkac 7a1646
--- bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib	2009-12-06 00:31:41.000000000 +0100
Adam Tkac 7a1646
+++ bind-9.7.2-P2/lib/export/isccfg/Makefile.in	2010-10-20 14:10:14.593741247 +0200
Adam Tkac 7a1646
@@ -30,11 +30,11 @@ CINCLUDES =	-I. ${DNS_INCLUDES} -I${expo
Adam Tkac 7a1646
 CDEFINES =
Adam Tkac 7a1646
 CWARNINGS =
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-ISCLIBS =	../isc/libisc.@A@
Adam Tkac 7a1646
-DNSLIBS =	../dns/libdns.@A@
Adam Tkac 7a1646
+ISCLIBS =	../isc/libisc-export.@A@
Adam Tkac 7a1646
+DNSLIBS =	../dns/libdns-export.@A@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
Adam Tkac 7a1646
-ISCCFGDEPLIBS =	libisccfg.@A@
Adam Tkac 7a1646
+ISCCFGDEPLIBS =	libisccfg-export.@A@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 LIBS =		@LIBS@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
@@ -58,26 +58,26 @@ version.@O@: ${srcdir}/version.c
Adam Tkac 7a1646
 		-DLIBAGE=${LIBAGE} \
Adam Tkac 7a1646
 		-c ${srcdir}/version.c
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libisccfg.@SA@: ${OBJS}
Adam Tkac 7a1646
+libisccfg-export.@SA@: ${OBJS}
Adam Tkac 7a1646
 	${AR} ${ARFLAGS} $@ ${OBJS}
Adam Tkac 7a1646
 	${RANLIB} $@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libisccfg.la: ${OBJS}
Adam Tkac 7a1646
+libisccfg-export.la: ${OBJS}
Adam Tkac 7a1646
 	 ${LIBTOOL_MODE_LINK} \
Adam Tkac 7a1646
-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la \
Adam Tkac 7a1646
+		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg-export.la \
Adam Tkac 7a1646
 		-rpath ${export_libdir} \
Adam Tkac 7a1646
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
Adam Tkac 7a1646
 		${OBJS} ${LIBS} ${DNSLIBS} ${ISCLIBS}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-timestamp: libisccfg.@A@
Adam Tkac 7a1646
+timestamp: libisccfg-export.@A@
Adam Tkac 7a1646
 	touch timestamp
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 installdirs:
Adam Tkac 7a1646
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 install:: timestamp installdirs
Adam Tkac 7a1646
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ \
Adam Tkac 2ccdf6
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg-export.@A@ \
Adam Tkac 86c080
 	${DESTDIR}${export_libdir}/
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 clean distclean::
Adam Tkac 7a1646
-	rm -f libisccfg.@A@ timestamp
Adam Tkac 7a1646
+	rm -f libisccfg-export.@A@ timestamp
Adam Tkac 5856f0
diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isc/Makefile.in
Adam Tkac 9b81ef
--- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib	2010-06-10 01:49:43.000000000 +0200
Adam Tkac 7a1646
+++ bind-9.7.2-P2/lib/export/isc/Makefile.in	2010-10-20 14:05:25.433861543 +0200
Adam Tkac 5856f0
@@ -101,6 +101,10 @@ SRCS =		@ISC_EXTRA_SRCS@ \
Adam Tkac 5856f0
 
Adam Tkac 5856f0
 LIBS =		@LIBS@
Adam Tkac 5856f0
 
Adam Tkac 5856f0
+# Note: the order of SUBDIRS is important.
Adam Tkac 5856f0
+# Attempt to disable parallel processing.
Adam Tkac 5856f0
+.NOTPARALLEL:
Adam Tkac 5856f0
+.NO_PARALLEL:
Adam Tkac 5856f0
 SUBDIRS =	include unix nls @ISC_THREAD_DIR@
Adam Tkac 5856f0
 TARGETS =	timestamp
Adam Tkac 5856f0
 
Adam Tkac 7a1646
@@ -114,26 +118,26 @@ version.@O@: ${srcdir}/version.c
Adam Tkac 7a1646
 		-DLIBAGE=${LIBAGE} \
Adam Tkac 7a1646
 		-c ${srcdir}/version.c
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libisc.@SA@: ${OBJS}
Adam Tkac 7a1646
+libisc-export.@SA@: ${OBJS}
Adam Tkac 7a1646
 	${AR} ${ARFLAGS} $@ ${OBJS}
Adam Tkac 7a1646
 	${RANLIB} $@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-libisc.la: ${OBJS}
Adam Tkac 7a1646
+libisc-export.la: ${OBJS}
Adam Tkac 7a1646
 	${LIBTOOL_MODE_LINK} \
Adam Tkac 7a1646
-		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \
Adam Tkac 7a1646
+		${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \
Adam Tkac 7a1646
 		-rpath ${export_libdir} \
Adam Tkac 7a1646
 		-version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
Adam Tkac 7a1646
 		${OBJS} ${LIBS}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-timestamp: libisc.@A@
Adam Tkac 7a1646
+timestamp: libisc-export.@A@
Adam Tkac 7a1646
 	touch timestamp
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 installdirs:
Adam Tkac 7a1646
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 install:: timestamp installdirs
Adam Tkac 7a1646
-	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ \
Adam Tkac 2ccdf6
+	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \
Adam Tkac 7a1646
 	${DESTDIR}${export_libdir}
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 clean distclean::
Adam Tkac 7a1646
-	rm -f libisc.@A@ libisc.la timestamp
Adam Tkac 7a1646
+	rm -f libisc-export.@A@ libisc-export.la timestamp
Adam Tkac 7a1646
diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/lib/export/samples/Makefile.in
Adam Tkac 7a1646
--- bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib	2009-12-06 00:31:41.000000000 +0100
Adam Tkac 7a1646
+++ bind-9.7.2-P2/lib/export/samples/Makefile.in	2010-10-20 14:05:25.433861543 +0200
Adam Tkac 7a1646
@@ -30,15 +30,15 @@ CINCLUDES =	-I${srcdir}/include -I../dns
Adam Tkac 7a1646
 CDEFINES =
Adam Tkac 7a1646
 CWARNINGS =
Adam Tkac 7a1646
 
Adam Tkac 7a1646
-DNSLIBS =	../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
Adam Tkac 7a1646
-ISCLIBS =	../isc/libisc.@A@
Adam Tkac 7a1646
-ISCCFGLIBS =	../isccfg/libisccfg.@A@
Adam Tkac 7a1646
-IRSLIBS =	../irs/libirs.@A@
Adam Tkac 7a1646
-
Adam Tkac 7a1646
-DNSDEPLIBS =	../dns/libdns.@A@
Adam Tkac 7a1646
-ISCDEPLIBS =	../isc/libisc.@A@
Adam Tkac 7a1646
-ISCCFGDEPLIBS =	../isccfg/libisccfg.@A@
Adam Tkac 7a1646
-IRSDEPLIBS =	../irs/libirs.@A@
Adam Tkac 7a1646
+DNSLIBS =	../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
Adam Tkac 7a1646
+ISCLIBS =	../isc/libisc-export.@A@
Adam Tkac 7a1646
+ISCCFGLIBS =	../isccfg/libisccfg-export.@A@
Adam Tkac 7a1646
+IRSLIBS =	../irs/libirs-export.@A@
Adam Tkac 7a1646
+
Adam Tkac 7a1646
+DNSDEPLIBS =	../dns/libdns-export.@A@
Adam Tkac 7a1646
+ISCDEPLIBS =	../isc/libisc-export.@A@
Adam Tkac 7a1646
+ISCCFGDEPLIBS =	../isccfg/libisccfg-export.@A@
Adam Tkac 7a1646
+IRSDEPLIBS =	../irs/libirs-export.@A@
Adam Tkac 7a1646
 
Adam Tkac 7a1646
 DEPLIBS =	${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
Adam Tkac 7a1646