diff options
| author | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-05-08 23:54:15 +0000 |
| commit | ed3fc70bf5a8edaf648093b11acca450802244ef (patch) | |
| tree | 8ce0ddd0e6f508bd20c77429c448969589170fae /rescue | |
| parent | d4e443e0426fee44056ba3c1123455666d083aef (diff) | |
| parent | a2e6be0add027bf3e713c0d56ba9715b83a01144 (diff) | |
| download | FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.zip FreeBSD-src-ed3fc70bf5a8edaf648093b11acca450802244ef.tar.gz | |
Merge from head
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/librescue/Makefile | 2 | ||||
| -rw-r--r-- | rescue/rescue/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile index 62f5da1..ad4931e 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 ea0d137..fc778f0 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 |
