summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/Makefile1
-rw-r--r--usr.sbin/mergemaster/Makefile11
2 files changed, 12 insertions, 0 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 75c4be7..b56da8f 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -37,6 +37,7 @@ SUBDIR= IPXrouted \
lpr \
manctl \
memcontrol \
+ mergemaster \
moused \
mrouted \
mtest \
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile
new file mode 100644
index 0000000..8169805
--- /dev/null
+++ b/usr.sbin/mergemaster/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+MAINTAINER= billf@FreeBSD.org
+MAN8= mergemaster.8
+
+beforeinstall:
+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${.CURDIR}/mergemaster ${DESTDIR}${BINDIR}/mergemaster
+
+.include <bsd.prog.mk>
+
OpenPOWER on IntegriCloud