summaryrefslogtreecommitdiff
path: root/usr.bin/svn
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 /usr.bin/svn
parentf974b33f6ed6f35170c520d2be111bfc2c3954cd (diff)
parent16aa1f0950a3b4407a36ecc96acc8ca0710ebd91 (diff)
downloadsrc-test2-cc3f4b99653c34ae64f8a1fddea370abefef680e.tar.gz
src-test2-cc3f4b99653c34ae64f8a1fddea370abefef680e.zip
Merge from head
Notes
Notes: svn path=/projects/bmake/; revision=265720
Diffstat (limited to 'usr.bin/svn')
-rw-r--r--usr.bin/svn/Makefile.inc2
-rw-r--r--usr.bin/svn/lib/libapr_util/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
index fb50b227567c..203b8175bd94 100644
--- a/usr.bin/svn/Makefile.inc
+++ b/usr.bin/svn/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_SVN} == "yes"
SVNLITE?=
diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile
index 4f25e8f5bfac..df2d1f9a2104 100644
--- a/usr.bin/svn/lib/libapr_util/Makefile
+++ b/usr.bin/svn/lib/libapr_util/Makefile
@@ -28,7 +28,7 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${APR}/include/arch/unix \
-I${APR}/include
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_ICONV} == "yes"
CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1