aboutsummaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2014-05-08 23:54:15 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2014-05-08 23:54:15 +0000
commitcc3f4b99653c34ae64f8a1fddea370abefef680e (patch)
tree8ce0ddd0e6f508bd20c77429c448969589170fae /rescue
parentf974b33f6ed6f35170c520d2be111bfc2c3954cd (diff)
parent16aa1f0950a3b4407a36ecc96acc8ca0710ebd91 (diff)
downloadsrc-cc3f4b99653c34ae64f8a1fddea370abefef680e.tar.gz
src-cc3f4b99653c34ae64f8a1fddea370abefef680e.zip
Merge from head
Notes
Notes: svn path=/projects/bmake/; revision=265720
Diffstat (limited to 'rescue')
-rw-r--r--rescue/librescue/Makefile2
-rw-r--r--rescue/rescue/Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index 62f5da1ba292..ad4931e52c66 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
# Certain library entries have hard-coded references to
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index ea0d1370d80c..fc778f0aa280 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -3,7 +3,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG= rescue
@@ -52,7 +52,7 @@ CRUNCH_SRCDIRS+= bin
CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
ed expr getfacl hostname kenv kill ln ls mkdir mv \
pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcap -lutil
CRUNCH_BUILDTOOLS+= bin/sh
# Additional options for specific programs
@@ -120,7 +120,7 @@ CRUNCH_PROGS_sbin+= zpool
CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
.if ${MK_ZFS} != "no"
-CRUNCH_LIBS+= -lavl -ljail -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
+CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
.endif
CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz