Author: bdrewery
Date: Thu Feb 18 00:26:21 2016
New Revision: 295733
URL: https://svnweb.freebsd.org/changeset/base/295733
Log:
Fix installation of makewhatis.local(1) since r283777.
The wrapper script has moved to libexec/makewhatis.local since it is not
directlry related to the older makewhatis(1) utility that has been replaced
by the usr.bin/mandoc version.
Reported by: vangyzen
Added:
head/libexec/makewhatis.local/
- copied from r295732, head/usr.bin/makewhatis/
Deleted:
head/libexec/makewhatis.local/makewhatis.1
head/libexec/makewhatis.local/makewhatis.c
Modified:
head/libexec/Makefile
head/libexec/makewhatis.local/Makefile
head/libexec/makewhatis.local/Makefile.depend
head/usr.bin/makewhatis/Makefile
Modified: head/libexec/Makefile
==============================================================================
--- head/libexec/Makefile Thu Feb 18 00:00:51 2016 (r295732)
+++ head/libexec/Makefile Thu Feb 18 00:26:21 2016 (r295733)
@@ -10,6 +10,7 @@ SUBDIR= ${_atf} \
${_dma} \
getty \
${_mail.local} \
+ ${_makewhatis.local} \
${_mknetid} \
${_pppoed} \
revnetgroup \
@@ -88,6 +89,10 @@ _mail.local= mail.local
_smrsh= smrsh
.endif
+.if ${MK_MAN_UTILS} != "no"
+_makewhatis.local= makewhatis.local
+.endif
+
.if ${MK_TALK} != "no"
SUBDIR+= talkd
.endif
Modified: head/libexec/makewhatis.local/Makefile
==============================================================================
--- head/usr.bin/makewhatis/Makefile Thu Feb 18 00:00:51 2016
(r295732)
+++ head/libexec/makewhatis.local/Makefile Thu Feb 18 00:26:21 2016
(r295733)
@@ -1,9 +1,7 @@
# $FreeBSD$
-PROG= makewhatis
-LIBADD= z
SCRIPTS= makewhatis.local.sh
-MAN= makewhatis.1 makewhatis.local.8
+MAN= makewhatis.local.8
SCRIPTSDIR= ${LIBEXECDIR}
LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local
MLINKS= makewhatis.local.8 catman.local.8
Modified: head/libexec/makewhatis.local/Makefile.depend
==============================================================================
--- head/usr.bin/makewhatis/Makefile.depend Thu Feb 18 00:00:51 2016
(r295732)
+++ head/libexec/makewhatis.local/Makefile.depend Thu Feb 18 00:26:21
2016 (r295733)
@@ -2,14 +2,6 @@
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
- gnu/lib/libgcc \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
- lib/libz \
.include <dirdeps.mk>
Modified: head/usr.bin/makewhatis/Makefile
==============================================================================
--- head/usr.bin/makewhatis/Makefile Thu Feb 18 00:00:51 2016
(r295732)
+++ head/usr.bin/makewhatis/Makefile Thu Feb 18 00:26:21 2016
(r295733)
@@ -2,10 +2,5 @@
PROG= makewhatis
LIBADD= z
-SCRIPTS= makewhatis.local.sh
-MAN= makewhatis.1 makewhatis.local.8
-SCRIPTSDIR= ${LIBEXECDIR}
-LINKS= ${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local
-MLINKS= makewhatis.local.8 catman.local.8
.include <bsd.prog.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
