s/SADIR/STANDIR/ to avoid conflict w/ the libsa; install raw boot as well as cooked

1 files changed, 14 insertions, 14 deletions

diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc
index fc769689789..8e4e8483d11 100644
--- a/sys/arch/hppa/stand/Makefile.inc
+++ b/sys/arch/hppa/stand/Makefile.inc
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2002/12/08 17:08:32 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.11 2003/03/28 22:40:47 mickey Exp $
 
 CFLAGS=${DEBUG} -Os -Wall -Werror
 CPPFLAGS+=-I${S} -I. -I${.CURDIR}
-SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${SADIR}/libsa
+SACFLAGS=-nostdinc -fno-builtin -D_STANDALONE -I${STANDIR}/libsa
 SACFLAGS+=-mdisable-fpregs -mfast-indirect-calls -mpa-risc-1-0
 SACFLAGS+=-fno-stack-protector
 #DEBUGFLAGS=-DDEBUG
@@ -21,25 +21,25 @@ DEBUGLIBS=	no
 	@([ -h machine ] || ln -s $(S)/arch/hppa/include machine)
 .endif
 
-.if exists(${SADIR}/libsa/libsa.a)
-LIBSA=${SADIR}/libsa/libsa.a
+.if exists(${STANDIR}/libsa/libsa.a)
+LIBSA=${STANDIR}/libsa/libsa.a
 .else
-LIBSA=${SADIR}/libsa/${__objdir}/libsa.a
+LIBSA=${STANDIR}/libsa/${__objdir}/libsa.a
 .endif
-.if exists(${SADIR}/libkern/libkern.a)
-LIBKERN=${SADIR}/libkern/libkern.a
+.if exists(${STANDIR}/libkern/libkern.a)
+LIBKERN=${STANDIR}/libkern/libkern.a
 .else
-LIBKERN=${SADIR}/libkern/${__objdir}/libkern.a
+LIBKERN=${STANDIR}/libkern/${__objdir}/libkern.a
 .endif
-.if exists(${SADIR}/libz/libz.a)
-LIBZ=${SADIR}/libz/libz.a
+.if exists(${STANDIR}/libz/libz.a)
+LIBZ=${STANDIR}/libz/libz.a
 .else
-LIBZ=${SADIR}/libz/${__objdir}/libz.a
+LIBZ=${STANDIR}/libz/${__objdir}/libz.a
 .endif
-.if exists(${SADIR}/mkboot/mkboot)
-MKBOOT=${SADIR}/mkboot/mkboot
+.if exists(${STANDIR}/mkboot/mkboot)
+MKBOOT=${STANDIR}/mkboot/mkboot
 .else
-MKBOOT=${SADIR}/mkboot/${__objdir}/mkboot
+MKBOOT=${STANDIR}/mkboot/${__objdir}/mkboot
 .endif
 
 BINDIR=	/usr/mdec