Make install directories from top down.

diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index 02a6eb8460f066d8c761288d455e4545650ca71a..c08cbf06c5a37ca1e57dabff01ee0fcbecf54d02 100644 (file)
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -1,6 +1,6 @@
 # Makefile.dist
 #
-# Copyright (c) 1996, 1997 The Internet Software Consortium.
+# Copyright (c) 1996, 1997, 1998 The Internet Software Consortium.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,19 +44,23 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 all:   $(PROG) $(CATMANPAGES)
 
 install: $(PROG) $(CATMANPAGES)
+       @for dir in $(BINDIR) $(ADMMANDIR); do \
+         case $$dir in \
+           /*) base=/ ;; \
+           *) base="" ;; \
+         esac; \
+         slash=""; \
+         for elt in `echo $$dir |sed -e 's/\// /g'`; do \
+           if [ ! -d $$base/$$elt ]; then \
+             echo Making $$base/$$elt; \
+             mkdir $$base/$$elt; \
+             chmod 755 $$base/$$elt; \
+           fi; \
+           base=$$base$$slash$$elt; \
+           slash=/; \
+         done; \
+       done
        $(INSTALL) dhcrelay $(BINDIR); $(CHMOD) 755 $(BINDIR)/dhcrelay
-       if [ ! -d $(ADMMANDIR) ]; then \
-         mkdir $(ADMMANDIR); \
-         chmod 755 $(ADMMANDIR); \
-        fi
-       if [ ! -d $(FFMANDIR) ]; then \
-         mkdir $(FFMANDIR); \
-         chmod 755 $(FFMANDIR); \
-        fi
-       if [ ! -d $(VARDB) ]; then \
-         mkdir $(VARDB); \
-         chmod 755 $(VARDB); \
-       fi
        $(MANINSTALL) $(MANFROM) dhcrelay.cat8 $(MANTO) \
                                $(ADMMANDIR)/dhcrelay$(ADMMANEXT)
 

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 9dbea5dca345f44787a441fb21bf222cf26ca3d1..9347049cd32583322fd3ce53fb2235477b22eeaf 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -1,6 +1,6 @@
 # Makefile.dist
 #
-# Copyright (c) 1996, 1997 The Internet Software Consortium.
+# Copyright (c) 1996, 1997, 1998 The Internet Software Consortium.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,19 +44,23 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 all:   $(PROG) $(CATMANPAGES)
 
 install: $(PROG) $(CATMANPAGES)
+       @for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \
+         case $$dir in \
+           /*) base=/ ;; \
+           *) base="" ;; \
+         esac; \
+         slash=""; \
+         for elt in `echo $$dir |sed -e 's/\// /g'`; do \
+           if [ ! -d $$base/$$elt ]; then \
+             echo Making $$base/$$elt; \
+             mkdir $$base/$$elt; \
+             chmod 755 $$base/$$elt; \
+           fi; \
+           base=$$base$$slash$$elt; \
+           slash=/; \
+         done; \
+       done
        $(INSTALL) dhcpd $(BINDIR); $(CHMOD) 755 $(BINDIR)/dhcpd
-       if [ ! -d $(ADMMANDIR) ]; then \
-         mkdir $(ADMMANDIR); \
-         chmod 755 $(ADMMANDIR); \
-        fi
-       if [ ! -d $(FFMANDIR) ]; then \
-         mkdir $(FFMANDIR); \
-         chmod 755 $(FFMANDIR); \
-        fi
-       if [ ! -d $(VARDB) ]; then \
-         mkdir $(VARDB); \
-         chmod 755 $(VARDB); \
-       fi
        $(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \
                                $(ADMMANDIR)/dhcpd$(ADMMANEXT)
        $(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \