From 922e6a3c2ac4ef900dd9dc99f0cc137f18372583 Mon Sep 17 00:00:00 2001
From: Andreas Gustafsson <source@isc.org>
Date: Wed, 20 Sep 2000 19:06:16 +0000
Subject: [PATCH]  478.   [bug]           "make install" failed if the
 directory specified with                         --prefix did not already
 exist.

---
 CHANGES                                   |  3 ++
 Makefile.in                               |  6 ++--
 bin/dig/Makefile.in                       |  6 ++--
 bin/dnssec/Makefile.in                    |  6 ++--
 bin/named/Makefile.in                     |  6 ++--
 bin/nsupdate/Makefile.in                  |  6 ++--
 bin/rndc/Makefile.in                      |  6 ++--
 lib/dns/Makefile.in                       |  6 ++--
 lib/dns/include/dns/Makefile.in           |  9 ++---
 lib/dns/sec/dst/include/dst/Makefile.in   |  9 ++---
 lib/isc/Makefile.in                       |  6 ++--
 lib/isc/include/isc/Makefile.in           |  9 ++---
 lib/isc/nothreads/include/isc/Makefile.in |  9 ++---
 lib/isc/pthreads/include/isc/Makefile.in  |  9 ++---
 lib/isc/unix/include/isc/Makefile.in      |  9 ++---
 lib/isc/win32/include/isc/Makefile.in     |  9 ++---
 lib/lwres/Makefile.in                     |  6 ++--
 lib/lwres/include/lwres/Makefile.in       |  9 ++---
 lib/omapi/Makefile.in                     |  6 ++--
 lib/omapi/include/omapi/Makefile.in       |  9 ++---
 mkinstalldirs                             | 40 +++++++++++++++++++++++
 util/copyrights                           |  1 +
 22 files changed, 82 insertions(+), 103 deletions(-)
 create mode 100644 mkinstalldirs

diff --git a/CHANGES b/CHANGES
index 44ef0c7545..61397983e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 478.	[bug]		"make install" failed if the directory specified with
+			--prefix did not already exist.
+
  477.	[bug]		The the isc-config.sh script could be installed before
 			its directory was created. [RT #324]
 
diff --git a/Makefile.in b/Makefile.in
index 9815bf2ca6..e508042ac5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.32 2000/09/20 18:05:33 gson Exp $
+# $Id: Makefile.in,v 1.33 2000/09/20 19:05:50 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -32,9 +32,7 @@ distclean::
 	rm -f util/conf.sh
 
 installdirs:
-	if [ ! -d ${DESTDIR}${bindir} ]; then \
-		mkdir ${DESTDIR}${bindir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
 
 install:: isc-config.sh installdirs
 	${INSTALL_PROGRAM} isc-config.sh ${DESTDIR}${bindir}
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 0656a666e4..8e11a4f60c 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.15 2000/08/17 02:11:36 bwelling Exp $
+# $Id: Makefile.in,v 1.16 2000/09/20 19:05:51 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -63,9 +63,7 @@ clean distclean::
 	rm -f ${TARGETS}
 
 installdirs:
-	if [ ! -d ${DESTDIR}${bindir} ]; then \
-		mkdir ${DESTDIR}${bindir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
 
 install:: dig host nslookup installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} dig ${DESTDIR}${bindir}
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index aba8244824..fea442d00c 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2000/08/17 02:11:37 bwelling Exp $
+# $Id: Makefile.in,v 1.11 2000/09/20 19:05:52 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -66,9 +66,7 @@ clean distclean::
 	rm -f ${TARGETS}
 
 installdirs:
-	if [ ! -d ${DESTDIR}${sbindir} ]; then \
-		mkdir ${DESTDIR}${sbindir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
 
 install:: ${TARGSTS} installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} ${TARGETS} ${DESTDIR}${sbindir}
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 7d751cecda..9e234f8ecb 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.54 2000/08/17 02:11:40 bwelling Exp $
+# $Id: Makefile.in,v 1.55 2000/09/20 19:05:54 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -80,9 +80,7 @@ clean distclean::
 	rm -f ${TARGETS}
 
 installdirs:
-	if [ ! -d ${DESTDIR}${sbindir} ]; then \
-		mkdir ${DESTDIR}${sbindir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
 
 install:: named lwresd installdirs
 	${LIBTOOL} ${INSTALL_PROGRAM} named ${DESTDIR}${sbindir}
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index e0c042c77f..ed193b29be 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.7 2000/08/17 02:11:41 bwelling Exp $
+# $Id: Makefile.in,v 1.8 2000/09/20 19:05:55 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -59,9 +59,7 @@ clean distclean::
 	rm -f ${TARGETS}
 
 installdirs:
-	if [ ! -d ${DESTDIR}${bindir} ]; then \
-		mkdir ${DESTDIR}${bindir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
 
 install:: nsupdate
 	${LIBTOOL} ${INSTALL_PROGRAM} nsupdate ${DESTDIR}${bindir}
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 579566ca9a..28c0c4b2c0 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.13 2000/08/17 02:11:42 bwelling Exp $
+# $Id: Makefile.in,v 1.14 2000/09/20 19:05:56 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -57,9 +57,7 @@ rndc: ${OBJS} ${DEPLIBS}
 	${LIBTOOL} ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS}
 
 installdirs:
-	if [ ! -d ${DESTDIR}${sbindir} ]; then \
-		mkdir ${DESTDIR}${sbindir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
 
 install:: rndc
 	${LIBTOOL} ${INSTALL_PROGRAM} rndc ${DESTDIR}${sbindir}
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 759d5889d4..f10ba05ae7 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.101 2000/09/16 01:15:22 bwelling Exp $
+# $Id: Makefile.in,v 1.102 2000/09/20 19:05:58 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -145,9 +145,7 @@ timestamp: libdns.@A@
 	touch timestamp
 
 installdirs:
-	if [ ! -d ${DESTDIR}${libdir} ]; then \
-		mkdir ${DESTDIR}${libdir} ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
 	${LIBTOOL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir}
diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index d76758725e..b4601239ec 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.32 2000/08/22 00:55:21 bwelling Exp $
+# $Id: Makefile.in,v 1.33 2000/09/20 19:05:59 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -46,12 +46,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/dns ]; then \
-		mkdir ${DESTDIR}${includedir}/dns ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/dns
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/dns/sec/dst/include/dst/Makefile.in b/lib/dns/sec/dst/include/dst/Makefile.in
index 051a08389f..db33d30735 100644
--- a/lib/dns/sec/dst/include/dst/Makefile.in
+++ b/lib/dns/sec/dst/include/dst/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.8 2000/08/01 01:27:57 tale Exp $
+# $Id: Makefile.in,v 1.9 2000/09/20 19:06:00 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,12 +29,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/dst ]; then \
-		mkdir ${DESTDIR}${includedir}/dst ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/dst
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index a6b454e48c..4e78a1859a 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.65 2000/08/29 18:23:58 bwelling Exp $
+# $Id: Makefile.in,v 1.66 2000/09/20 19:06:02 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -101,9 +101,7 @@ timestamp: libisc.@A@
 	touch timestamp
 
 installdirs:
-	if [ ! -d ${DESTDIR}${libdir} ]; then \
-		mkdir ${DESTDIR}${libdir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
 	${LIBTOOL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir}
diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 64827777d3..f20b44ccb3 100644
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.43 2000/08/17 00:18:00 bwelling Exp $
+# $Id: Makefile.in,v 1.44 2000/09/20 19:06:03 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -44,12 +44,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/isc ]; then \
-		mkdir ${DESTDIR}${includedir}/isc ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/isc
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index 310ea45ae4..5142f47340 100644
--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1 2000/08/28 23:16:49 bwelling Exp $
+# $Id: Makefile.in,v 1.2 2000/09/20 19:06:04 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,12 +29,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/isc ]; then \
-		mkdir ${DESTDIR}${includedir}/isc ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/isc
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index c174c6f63e..79e44f1bfd 100644
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.11 2000/08/01 01:31:04 tale Exp $
+# $Id: Makefile.in,v 1.12 2000/09/20 19:06:06 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,12 +29,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/isc ]; then \
-		mkdir ${DESTDIR}${includedir}/isc ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/isc
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 6da25ed16a..c6cd4f6fca 100644
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.23 2000/08/01 01:31:32 tale Exp $
+# $Id: Makefile.in,v 1.24 2000/09/20 19:06:08 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,12 +29,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/isc ]; then \
-		mkdir ${DESTDIR}${includedir}/isc ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/isc
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index 84262304a1..3953b974c3 100644
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.6 2000/08/01 01:31:55 tale Exp $
+# $Id: Makefile.in,v 1.7 2000/09/20 19:06:09 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -30,12 +30,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d $(includedir) ]; then \
-		mkdir $(includedir) ; \
-	fi
-	if [ ! -d $(includedir)\isc ]; then \
-		mkdir $(includedir)\isc ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}\isc
 
 install:: installdirs
 	for i in $(HEADERS); do \
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index 44a5cf1514..22dbc9d307 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.20 2000/08/01 01:32:07 tale Exp $
+# $Id: Makefile.in,v 1.21 2000/09/20 19:06:11 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -72,9 +72,7 @@ timestamp: liblwres.@A@
 	touch timestamp
 
 installdirs:
-	if [ ! -d ${DESTDIR}${libdir} ]; then \
-		mkdir ${DESTDIR}${libdir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
 	${LIBTOOL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir}
diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in
index 74acccdbab..74982c2e51 100644
--- a/lib/lwres/include/lwres/Makefile.in
+++ b/lib/lwres/include/lwres/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.12 2000/08/01 01:32:32 tale Exp $
+# $Id: Makefile.in,v 1.13 2000/09/20 19:06:12 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -33,12 +33,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/lwres ]; then \
-		mkdir ${DESTDIR}${includedir}/lwres ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/lwres
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/lib/omapi/Makefile.in b/lib/omapi/Makefile.in
index c1faf3ad3b..b1f14f6737 100644
--- a/lib/omapi/Makefile.in
+++ b/lib/omapi/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.14 2000/08/01 01:32:47 tale Exp $
+# $Id: Makefile.in,v 1.15 2000/09/20 19:06:13 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -72,9 +72,7 @@ timestamp: libomapi.@A@
 	touch timestamp
 
 installdirs:
-	if [ ! -d ${DESTDIR}${libdir} ]; then \
-		mkdir ${DESTDIR}${libdir}; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
 
 install:: timestamp installdirs
 	${LIBTOOL} ${INSTALL_DATA} libomapi.@A@ ${DESTDIR}${libdir}
diff --git a/lib/omapi/include/omapi/Makefile.in b/lib/omapi/include/omapi/Makefile.in
index e2daa381cc..97e6aa4382 100644
--- a/lib/omapi/include/omapi/Makefile.in
+++ b/lib/omapi/include/omapi/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.9 2000/08/01 01:33:06 tale Exp $
+# $Id: Makefile.in,v 1.10 2000/09/20 19:06:14 gson Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,12 +29,7 @@ TARGETS =
 @BIND9_MAKE_RULES@
 
 installdirs:
-	if [ ! -d ${DESTDIR}${includedir} ]; then \
-		mkdir ${DESTDIR}${includedir} ; \
-	fi
-	if [ ! -d ${DESTDIR}${includedir}/omapi ]; then \
-		mkdir ${DESTDIR}${includedir}/omapi ; \
-	fi
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/omapi
 
 install:: installdirs
 	for i in ${HEADERS}; do \
diff --git a/mkinstalldirs b/mkinstalldirs
new file mode 100644
index 0000000000..4992567c97
--- /dev/null
+++ b/mkinstalldirs
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.1 2000/09/20 19:05:51 gson Exp $
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp" 1>&2
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff --git a/util/copyrights b/util/copyrights
index a88ae217d5..9cb9574726 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -1336,6 +1336,7 @@
 ./make/includes.in				MAKE	1999,2000
 ./make/mkdep.in					X	1999,2000
 ./make/rules.in					MAKE	1998,1999,2000
+./mkinstalldirs					X	1996
 ./util/.cvsignore				X	2000
 ./util/COPYRIGHT				X	1996,1997,1998,1999,2000
 ./util/COPYRIGHT.BRIEF				X	1996,1997,1998,1999,2000