From a2f3208f7f754cbc5156a1d798ae06d8f3546be2 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Tue, 8 Feb 2000 21:50:23 +0000 Subject: [PATCH] add DESTDIR support --- bin/named/Makefile.in | 6 +++--- lib/dns/Makefile.in | 6 +++--- lib/dns/include/dns/Makefile.in | 12 ++++++------ lib/dns/sec/dst/include/dst/Makefile.in | 10 +++++----- lib/isc/Makefile.in | 6 +++--- lib/isc/include/isc/Makefile.in | 12 ++++++------ lib/isc/pthreads/include/isc/Makefile.in | 10 +++++----- lib/isc/unix/include/isc/Makefile.in | 10 +++++----- lib/lwres/Makefile.in | 6 +++--- lib/lwres/include/lwres/Makefile.in | 10 +++++----- lib/omapi/Makefile.in | 6 +++--- lib/omapi/include/omapi/Makefile.in | 10 +++++----- make/rules.in | 2 ++ 13 files changed, 54 insertions(+), 52 deletions(-) diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in index 6f5f10c094..d211f75689 100644 --- a/bin/named/Makefile.in +++ b/bin/named/Makefile.in @@ -60,9 +60,9 @@ clean distclean:: rm -f ${TARGETS} installdirs: - if [ ! -d ${sbindir} ]; then \ - mkdir ${sbindir}; \ + if [ ! -d ${DESTDIR}${sbindir} ]; then \ + mkdir ${DESTDIR}${sbindir}; \ fi install:: named installdirs - ${LIBTOOL} ${INSTALL_PROGRAM} named ${sbindir} + ${LIBTOOL} ${INSTALL_PROGRAM} named ${DESTDIR}${sbindir} diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in index 934720c282..8b00a1dae0 100644 --- a/lib/dns/Makefile.in +++ b/lib/dns/Makefile.in @@ -170,12 +170,12 @@ timestamp: libdns.@A@ touch timestamp installdirs: - if [ ! -d ${libdir} ]; then \ - mkdir ${libdir} ; \ + if [ ! -d ${DESTDIR}${libdir} ]; then \ + mkdir ${DESTDIR}${libdir} ; \ fi install:: timestamp installdirs - ${LIBTOOL} ${INSTALL_DATA} libdns.@A@ ${libdir} + ${LIBTOOL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libdns.@A@ timestamp diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in index 1032d9e111..dba3d7737e 100644 --- a/lib/dns/include/dns/Makefile.in +++ b/lib/dns/include/dns/Makefile.in @@ -41,17 +41,17 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/dns ]; then \ - mkdir ${includedir}/dns ; \ + if [ ! -d ${DESTDIR}${includedir}/dns ]; then \ + mkdir ${DESTDIR}${includedir}/dns ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${includedir}/dns ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dns ; \ done for i in ${GENHEADERS}; do \ - ${INSTALL_DATA} $$i ${includedir}/dns ; \ + ${INSTALL_DATA} $$i ${DESTDIR}${includedir}/dns ; \ done diff --git a/lib/dns/sec/dst/include/dst/Makefile.in b/lib/dns/sec/dst/include/dst/Makefile.in index 89cb459ffe..a0b4725248 100644 --- a/lib/dns/sec/dst/include/dst/Makefile.in +++ b/lib/dns/sec/dst/include/dst/Makefile.in @@ -27,14 +27,14 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/dst ]; then \ - mkdir ${includedir}/dst ; \ + if [ ! -d ${DESTDIR}${includedir}/dst ]; then \ + mkdir ${DESTDIR}${includedir}/dst ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${includedir}/dst ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/dst ; \ done diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index 1c4cbe49ce..081f13be44 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -92,12 +92,12 @@ timestamp: libisc.@A@ touch timestamp installdirs: - if [ ! -d ${libdir} ]; then \ - mkdir ${libdir}; \ + if [ ! -d ${DESTDIR}${libdir} ]; then \ + mkdir ${DESTDIR}${libdir}; \ fi install:: timestamp installdirs - ${LIBTOOL} ${INSTALL_DATA} libisc.@A@ ${libdir} + ${LIBTOOL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libisc.@A@ libisc.la timestamp diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index 17f9be39fa..926a8e1f6a 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -37,18 +37,18 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/isc ]; then \ - mkdir ${includedir}/isc ; \ + if [ ! -d ${DESTDIR}${includedir}/isc ]; then \ + mkdir ${DESTDIR}${includedir}/isc ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${includedir}/isc ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/isc ; \ done - ${INSTALL_DATA} platform.h ${includedir}/isc + ${INSTALL_DATA} platform.h ${DESTDIR}${includedir}/isc distclean:: rm -f platform.h diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in index c5da24238f..cb152cace7 100644 --- a/lib/isc/pthreads/include/isc/Makefile.in +++ b/lib/isc/pthreads/include/isc/Makefile.in @@ -27,14 +27,14 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/isc ]; then \ - mkdir ${includedir}/isc ; \ + if [ ! -d ${DESTDIR}${includedir}/isc ]; then \ + mkdir ${DESTDIR}${includedir}/isc ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} $(srcdir)/$$i ${includedir}/isc ; \ + ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in index 8ff8a94a23..e1899d0a24 100644 --- a/lib/isc/unix/include/isc/Makefile.in +++ b/lib/isc/unix/include/isc/Makefile.in @@ -27,14 +27,14 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/isc ]; then \ - mkdir ${includedir}/isc ; \ + if [ ! -d ${DESTDIR)${includedir}/isc ]; then \ + mkdir ${DESTDIR}${includedir}/isc ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} $(srcdir)/$$i ${includedir}/isc ; \ + ${INSTALL_DATA} $(srcdir)/$$i ${DESTDIR}${includedir}/isc ; \ done diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in index 2dd87fc7d6..2e109c303d 100644 --- a/lib/lwres/Makefile.in +++ b/lib/lwres/Makefile.in @@ -67,12 +67,12 @@ timestamp: liblwres.@A@ touch timestamp installdirs: - if [ ! -d ${libdir} ]; then \ - mkdir ${libdir}; \ + if [ ! -d ${DESTDIR}${libdir} ]; then \ + mkdir ${DESTDIR}${libdir}; \ fi install:: timestamp installdirs - ${LIBTOOL} ${INSTALL_DATA} liblwres.@A@ ${libdir} + ${LIBTOOL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f liblwres.@A@ liblwres.la timestamp diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in index 734088dc04..2bf33548f0 100644 --- a/lib/lwres/include/lwres/Makefile.in +++ b/lib/lwres/include/lwres/Makefile.in @@ -29,16 +29,16 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/lwres ]; then \ - mkdir ${includedir}/lwres ; \ + if [ ! -d ${DESTDIR}${includedir}/lwres ]; then \ + mkdir ${DESTDIR}${includedir}/lwres ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${includedir}/lwres ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/lwres ; \ done distclean:: diff --git a/lib/omapi/Makefile.in b/lib/omapi/Makefile.in index 4385b90f61..067311e1f5 100644 --- a/lib/omapi/Makefile.in +++ b/lib/omapi/Makefile.in @@ -69,12 +69,12 @@ timestamp: libomapi.@A@ touch timestamp installdirs: - if [ ! -d ${libdir} ]; then \ - mkdir ${libdir}; \ + if [ ! -d ${DESTDIR}${libdir} ]; then \ + mkdir ${DESTDIR}${libdir}; \ fi install:: timestamp installdirs - ${LIBTOOL} ${INSTALL_DATA} libomapi.@A@ ${libdir} + ${LIBTOOL} ${INSTALL_DATA} libomapi.@A@ ${DESTDIR}${libdir} clean distclean:: rm -f libomapi.@A@ libomapi.la timestamp diff --git a/lib/omapi/include/omapi/Makefile.in b/lib/omapi/include/omapi/Makefile.in index 9af469ac3d..aaa0d99d21 100644 --- a/lib/omapi/include/omapi/Makefile.in +++ b/lib/omapi/include/omapi/Makefile.in @@ -27,14 +27,14 @@ TARGETS = @BIND9_MAKE_RULES@ installdirs: - if [ ! -d ${includedir} ]; then \ - mkdir ${includedir} ; \ + if [ ! -d ${DESTDIR}${includedir} ]; then \ + mkdir ${DESTDIR}${includedir} ; \ fi - if [ ! -d ${includedir}/omapi ]; then \ - mkdir ${includedir}/omapi ; \ + if [ ! -d ${DESTDIR}${includedir}/omapi ]; then \ + mkdir ${DESTDIR}${includedir}/omapi ; \ fi install:: installdirs for i in ${HEADERS}; do \ - ${INSTALL_DATA} ${srcdir}/$$i ${includedir}/omapi ; \ + ${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/omapi ; \ done diff --git a/make/rules.in b/make/rules.in index f821fe423f..aa3f9faa9b 100644 --- a/make/rules.in +++ b/make/rules.in @@ -30,6 +30,8 @@ sbindir = @sbindir@ includedir = @includedir@ libdir = @libdir@ +DESTDIR = + @SET_MAKE@ top_builddir = @BIND9_TOP_BUILDDIR@