PERFORCE change 131801 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=131801

Change 131801 by peter at peter_melody on 2007/12/27 20:06:02

	buildworld compatability - find the includes in the tmproot.

Affected files ...

.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svn/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#3 edit
.. //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#3 edit

Differences ...

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_client/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	add.c blame.c cat.c checkout.c cleanup.c commit.c commit_util.c \
 	compat_providers.c copy.c ctx.c delete.c diff.c export.c externals.c \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_delta/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	cancel.c compose_delta.c debug_editor.c default_editor.c \
 	path_driver.c svndiff.c text_delta.c vdelta.c version.c xdelta.c

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_diff/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	diff.c diff3.c diff4.c diff_file.c lcs.c token.c util.c
 

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	access.c fs-loader.c
 

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_fs_fs/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	dag.c err.c fs.c fs_fs.c id.c key-gen.c lock.c tree.c
 

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	ra_loader.c
 

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_dav/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	commit.c fetch.c file_revs.c log.c merge.c options.c props.c replay.c \
 	session.c util.c

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_local/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	ra_plugin.c split_url.c
 

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_ra_svn/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	client.c cram.c editor.c editorp.c marshal.c version.c
 

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_repos/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	authz.c commit.c delta.c dump.c fs-wrap.c hooks.c load.c log.c \
 	node_tree.c replay.c reporter.c repos.c rev_hunt.c

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_subr/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	auth.c cmdline.c compat.c config.c config_auth.c config_file.c \
 	config_win.c constructors.c ctype.c date.c dso.c error.c hash.c io.c \

==== //depot/projects/hammer/usr.bin/svn/lib/libsvn_wc/Makefile#3 (text+ko) ====

@@ -8,7 +8,7 @@
 SHLIB_MAJOR=	1
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/../.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 SRCS =	adm_crawler.c adm_files.c adm_ops.c copy.c diff.c entries.c lock.c \
 	log.c merge.c props.c questions.c relocate.c revision_status.c \

==== //depot/projects/hammer/usr.bin/svn/svn/Makefile#3 (text+ko) ====

@@ -16,7 +16,7 @@
 	unlock-cmd.c update-cmd.c util.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \

==== //depot/projects/hammer/usr.bin/svn/svnadmin/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS=	main.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \

==== //depot/projects/hammer/usr.bin/svn/svndumpfilter/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS=	main.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \

==== //depot/projects/hammer/usr.bin/svn/svnlook/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS=	main.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \

==== //depot/projects/hammer/usr.bin/svn/svnserve/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS=	main.c serve.c winservice.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \

==== //depot/projects/hammer/usr.bin/svn/svnsync/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS=	main.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \

==== //depot/projects/hammer/usr.bin/svn/svnversion/Makefile#3 (text+ko) ====

@@ -10,7 +10,7 @@
 SRCS=	main.c
 
 CFLAGS+=-I${SVNDIR}/include -I${SVNDIR} -I${.CURDIR}/.. \
-	-I${INCLUDEDIR}/bsddav/neon -I${INCLUDEDIR}/bsdapr/apr
+	-I${DESTDIR}${INCLUDEDIR}/bsddav/neon -I${DESTDIR}${INCLUDEDIR}/bsdapr/apr
 
 DPADD=	${LIBBSDSVN_CLIENT} ${LIBBSDSVN_WC} ${LIBBSDSVN_FS} \
 	${LIBBSDSVN_FS_FS} ${LIBBSDSVN_REPOS} ${LIBBSDSVN_RA} \