MASSIVE merge from V3-RELEASE-BRANCH into HEAD. HEAD and V3-RELEASE are

[thirdparty/dhcp.git] / common / Makefile.dist

diff --git a/common/Makefile.dist b/common/Makefile.dist
index b62f31f9b029ebc30207c9e192c2355161b8fa58..5e40a0f5dfd8216e7fbe5666addf3eaaa1ed5189 100644 (file)
--- a/common/Makefile.dist
+++ b/common/Makefile.dist
@@ -1,16 +1,36 @@
 # Makefile.dist
-
-CATMANPAGES = dhcp-options.cat5 dhcp-contrib.cat5 dhcp-eval.cat5
-SEDMANPAGES = dhcp-options.man5 dhcp-contrib.man5 dhcp-eval.man5
+#
+# Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#   Internet Systems Consortium, Inc.
+#   950 Charter Street
+#   Redwood City, CA 94063
+#   <info@isc.org>
+#   http://www.isc.org/
+
+CATMANPAGES = dhcp-options.cat5 dhcp-eval.cat5
+SEDMANPAGES = dhcp-options.man5 dhcp-eval.man5
 SRC    = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
         lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c options.c \
-        inet.c tree.c tables.c alloc.c fddi.c ctrace.c \
-        dns.c resolv.c execute.c discover.c comapi.c
+        inet.c tree.c tables.c alloc.c fddi.c ctrace.c dns.c resolv.c \
+        execute.c discover.c comapi.c
 OBJ    = raw.o parse.o nit.o icmp.o dispatch.o conflex.o upf.o bpf.o socket.o \
         lpf.o dlpi.o packet.o tr.o ethernet.o memory.o print.o options.o \
-        inet.o tree.o tables.o alloc.o fddi.o ctrace.o \
-        dns.o resolv.o execute.o discover.o comapi.o
-MAN    = dhcp-options.5 dhcp-contrib.5 dhcp-eval.5
+        inet.o tree.o tables.o alloc.o fddi.o ctrace.o dns.o resolv.o \
+        execute.o discover.o comapi.o
+MAN    = dhcp-options.5 dhcp-eval.5
 
 INCLUDES = -I$(TOP) $(BINDINC) -I$(TOP)/includes
 CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS)
@@ -37,8 +57,6 @@ install: all
                                $(DESTDIR)$(FFMANDIR)/dhcp-options$(FFMANEXT)
        $(MANINSTALL) $(MANFROM) dhcp-eval.$(MANCAT)5 $(MANTO) \
                                $(DESTDIR)$(FFMANDIR)/dhcp-eval$(FFMANEXT)
-       $(MANINSTALL) $(MANFROM) dhcp-contrib.$(MANCAT)5 $(MANTO) \
-                               $(DESTDIR)$(FFMANDIR)/dhcp-contrib$(FFMANEXT)
 
 depend:
        $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC)
@@ -74,11 +92,4 @@ dhcp-eval.man5:      dhcp-eval.5
        sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
                -e "s#RUNDIR#$(VARRUN)#g" < dhcp-eval.5 >dhcp-eval.man5
 
-dhcp-contrib.cat5:     dhcp-contrib.man5
-       nroff -man dhcp-contrib.man5 >dhcp-contrib.cat5
-
-dhcp-contrib.man5:     dhcp-contrib.5
-       sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
-               -e "s#RUNDIR#$(VARRUN)#g" < dhcp-contrib.5 >dhcp-contrib.man5
-
 # Dependencies (semi-automatically-generated)