Date: Sat, 5 Apr 2014 18:01:50 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264159 - in head: share/mk usr.bin/sort Message-ID: <201404051801.s35I1oPj011377@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sat Apr 5 18:01:49 2014 New Revision: 264159 URL: http://svnweb.freebsd.org/changeset/base/264159 Log: Convert sort to using newer MK_ convention. Modified: head/share/mk/bsd.own.mk head/usr.bin/sort/Makefile Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Sat Apr 5 18:00:45 2014 (r264158) +++ head/share/mk/bsd.own.mk Sat Apr 5 18:01:49 2014 (r264159) @@ -361,6 +361,7 @@ __DEFAULT_NO_OPTIONS = \ OFED \ OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN \ + SORT_THREADS \ SVN \ TESTS \ USB_GADGET_EXAMPLES Modified: head/usr.bin/sort/Makefile ============================================================================== --- head/usr.bin/sort/Makefile Sat Apr 5 18:00:45 2014 (r264158) +++ head/usr.bin/sort/Makefile Sat Apr 5 18:01:49 2014 (r264159) @@ -11,7 +11,7 @@ sort.1: sort.1.in CLEANFILES+= sort.1 -.if defined(WITH_THREADS) +.if ${MK_SORT_THREADS} != "no" CFLAGS+= -DSORT_THREADS LDFLAGS+= -lpthread -lmd MAN_SUB+= -e 's|%%THREADS%%||g' @@ -20,7 +20,7 @@ LDFLAGS+= -lmd MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g' .endif -.if !defined(WITHOUT_NLS) +.if ${MK_NLS} != "no" NLS+= hu_HU.ISO8859-2 NLSSRCFILES= ${NLS:S@$@.msg@} MAN_SUB+= -e 's|%%NLS%%||g'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404051801.s35I1oPj011377>