summaryrefslogtreecommitdiffstats
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2014-07-02 14:54:41 +0000
committermarcel <marcel@FreeBSD.org>2014-07-02 14:54:41 +0000
commita33844e926a330bdb5c1966b112da53d2735b82a (patch)
tree26c8d3108a777e90434c7a3347a4cfee6c3ed237 /usr.bin/Makefile
parent62024097ea597140238f1338c25f54390d09d619 (diff)
downloadFreeBSD-src-a33844e926a330bdb5c1966b112da53d2735b82a.zip
FreeBSD-src-a33844e926a330bdb5c1966b112da53d2735b82a.tar.gz
MFC mkimg(1) -- revisions 268159, 268134, 266556, 266514, 266513,
266512, 266511, 266510, 266509, 266176, 265468, 265467, 265462, 265170, 263926, 263924, 263923, 263919 and 263918. Revision 267182 changed mkimg.1 alongside other unrelated manpages. The change to mkimg.1 has been applied without registering a merge of the revision. This allows a future merge of r267182 to happen. Relnotes: yes
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index b88768b..f81ce7d 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -106,6 +106,7 @@ SUBDIR= alias \
mkdep \
${_mkesdb} \
mkfifo \
+ mkimg \
mklocale \
mktemp \
mkulzma \
OpenPOWER on IntegriCloud