Support DESTDIR on installs.

diff --git a/common/Makefile.dist b/common/Makefile.dist
index 613933469a780ff8a65b32efc3e0b3f02bda905a..fadfe396ec4478130ca2963b45ecde0b8cf3d20b 100644 (file)
--- a/common/Makefile.dist
+++ b/common/Makefile.dist
@@ -1,6 +1,7 @@
 # Makefile.dist
 #
-# Copyright (c) 1996 The Internet Software Consortium.  All rights reserved.
+# Copyright (c) 1996, 1999 The Internet Software Consortium.
+# All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -50,12 +51,18 @@ libdhcp.a:  $(OBJ)
        ranlib libdhcp.a
 
 install: $(CATMANPAGES)
-       if [ ! -d $(FFMANDIR) ]; then \
-         mkdir $(FFMANDIR); \
-         chmod 755 $(FFMANDIR); \
-        fi
+       for dir in $(FFMANDIR); do \
+         foo=""; \
+         for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
+           foo=$${foo}/$$bar; \
+           if [ ! -d $$foo ]; then \
+             mkdir $$foo; \
+             chmod 755 $$foo; \
+           fi; \
+         done; \
+       done
        $(MANINSTALL) $(MANFROM) dhcp-options.cat5 $(MANTO) \
-                               $(FFMANDIR)/dhcp-options$(FFMANEXT)
+                               $(DESTDIR)$(FFMANDIR)/dhcp-options$(FFMANEXT)
 
 
 clean:

diff --git a/relay/Makefile.dist b/relay/Makefile.dist
index 02a6eb8460f066d8c761288d455e4545650ca71a..a00daa5598dba9411ccb3a5e1128dc21aa6b2af2 100644 (file)
--- a/relay/Makefile.dist
+++ b/relay/Makefile.dist
@@ -44,21 +44,20 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 all:   $(PROG) $(CATMANPAGES)
 
 install: $(PROG) $(CATMANPAGES)
-       $(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
+       for dir in $(BINDIR) $(ADMMANDIR); do \
+         foo=""; \
+         for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
+           foo=$${foo}/$$bar; \
+           if [ ! -d $$foo ]; then \
+             mkdir $$foo; \
+             chmod 755 $$foo; \
+           fi; \
+         done; \
+       done
+       $(INSTALL) dhcrelay $(DESTDIR)$(BINDIR)
+       $(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcrelay
        $(MANINSTALL) $(MANFROM) dhcrelay.cat8 $(MANTO) \
-                               $(ADMMANDIR)/dhcrelay$(ADMMANEXT)
+                               $(DESTDIR)$(ADMMANDIR)/dhcrelay$(ADMMANEXT)
 
 clean:
        -rm -f $(OBJS) dhclient.o

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 9dbea5dca345f44787a441fb21bf222cf26ca3d1..4909c807194d75c34dfdf6245c46919da5737f14 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, 1999 The Internet Software Consortium.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,25 +44,24 @@ CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
 all:   $(PROG) $(CATMANPAGES)
 
 install: $(PROG) $(CATMANPAGES)
-       $(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
+       for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \
+         foo=""; \
+         for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
+           foo=$${foo}/$$bar; \
+           if [ ! -d $$foo ]; then \
+             mkdir $$foo; \
+             chmod 755 $$foo; \
+           fi; \
+         done; \
+       done
+       $(INSTALL) dhcpd $(DESTDIR)$(BINDIR)
+       $(CHMOD) 755 $(DESTDIR)$(BINDIR)/dhcpd
        $(MANINSTALL) $(MANFROM) dhcpd.cat8 $(MANTO) \
-                               $(ADMMANDIR)/dhcpd$(ADMMANEXT)
+                       $(DESTDIR)$(ADMMANDIR)/dhcpd$(ADMMANEXT)
        $(MANINSTALL) $(MANFROM) dhcpd.conf.cat5 $(MANTO) \
-                               $(FFMANDIR)/dhcpd.conf$(FFMANEXT)
+                       $(DESTDIR)$(FFMANDIR)/dhcpd.conf$(FFMANEXT)
        $(MANINSTALL) $(MANFROM) dhcpd.leases.cat5 $(MANTO) \
-                               $(FFMANDIR)/dhcpd.leases$(FFMANEXT)
+                       $(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT)
 
 clean:
        -rm -f $(OBJS)