Index: head/sys/boot/geli/Makefile
===================================================================
--- head/sys/boot/geli/Makefile	(revision 324878)
+++ head/sys/boot/geli/Makefile	(revision 324879)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 # libgeliboot
 
 MAN=
 
 .include <src.opts.mk>
 MK_SSP=		no
 
 LIB=		geliboot
 INTERNALLIB=
 MK_PROFILE=	no
 NO_PIC=
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=        -march=i386
 .endif
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=        -m32
 .endif
 
 WARNS?=		0
 
 # string functions from libc
-.PATH: ${.CURDIR}/../../../lib/libc/string
+.PATH: ${SRCTOP}/lib/libc/string
 SRCS+=  bcmp.c bcopy.c bzero.c
 
 # Our password input method
 SRCS+=  pwgets.c
 
 # sha256 and sha512 from sys/crypto
 .PATH: ${SRCTOP}/sys/crypto/sha2
 CFLAGS+=	-DWEAK_REFS
 SRCS+=		sha256c.c sha512c.c
 
 # md5 from libmd
 .PATH: ${SRCTOP}/lib/libmd
 SRCS+=		md5c.c
 
 # AES implementation from sys/crypto
 .PATH: ${SRCTOP}/sys/crypto/rijndael
 CFLAGS+=	-I${.CURDIR}/../../
 CFLAGS+=	-I${.CURDIR}/../common/
 # Remove asserts
 CFLAGS+=	-DNDEBUG
 SRCS+=		rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c
 
 # local GELI Implementation
 .PATH: ${SRCTOP}/sys/geom/eli
 CFLAGS+=	-D_STAND
 SRCS+=		geliboot_crypto.c g_eli_hmac.c g_eli_key.c g_eli_key_cache.c pkcs5v2.c
 
 .include <bsd.stand.mk>
 .include <bsd.lib.mk>
Index: head/sys/boot/powerpc/boot1.chrp/Makefile
===================================================================
--- head/sys/boot/powerpc/boot1.chrp/Makefile	(revision 324878)
+++ head/sys/boot/powerpc/boot1.chrp/Makefile	(revision 324879)
@@ -1,43 +1,43 @@
 # $FreeBSD$
 
 SSP_CFLAGS=
 
 PROG=           boot1.elf
 NEWVERSWHAT=    "Open Firmware boot block" ${MACHINE_ARCH}
 BINDIR?=        /boot
 INSTALLFLAGS=   -b
 
 FILES=		boot1.hfs
 SRCS=		boot1.c ashldi3.c syncicache.c
 
 MAN=
 
 CFLAGS= -ffreestanding -msoft-float \
 	-I${.CURDIR}/../../common -I${.CURDIR}/../../../ \
 	-D_STANDALONE
 LDFLAGS=-nostdlib -static -Wl,-N
 
 .include "../Makefile.inc"
 
-.PATH:  ${.CURDIR}/../../../libkern ${.CURDIR}/../../../../lib/libc/powerpc/gen ${.CURDIR}
+.PATH:  ${.CURDIR}/../../../libkern ${SRCTOP}/lib/libc/powerpc/gen ${.CURDIR}
 
 # The following inserts out objects into a template HFS 
 # created by generate-hfs.sh
 
 .include "${.CURDIR}/Makefile.hfs"
 
 boot1.hfs: boot1.elf bootinfo.txt
 	echo ${.OBJDIR}
 	uudecode ${.CURDIR}/hfs.tmpl.bz2.uu
 	mv hfs.tmpl.bz2 ${.TARGET}.bz2
 	bzip2 -f -d ${.TARGET}.bz2
 	${DD} if=boot1.elf of=${.TARGET} seek=${BOOT1_OFFSET} conv=notrunc
 	${DD} if=${.CURDIR}/bootinfo.txt of=${.TARGET} seek=${BOOTINFO_OFFSET} \
 	    conv=notrunc
 
 CLEANFILES= boot1.hfs
 
 boot1.o: ${SASRC}/ufsread.c
 
 .include <bsd.prog.mk>