Build nicely when $S is absolute

2 files changed, 10 insertions, 13 deletions

diff --git a/sys/compat/common/Makefile b/sys/compat/common/Makefile
index d8871fcb934..e681d104d97 100644
--- a/sys/compat/common/Makefile
+++ b/sys/compat/common/Makefile
@@ -1,12 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 1996/05/22 12:01:44 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/05/30 09:40:57 niklas Exp $
 #	$NetBSD: Makefile,v 1.8 1996/05/18 15:52:19 christos Exp $
 
 LIB=	compat
 NOPIC=
 
-CPPFLAGS=	${COMPATCPPFLAGS:S/-I./-I${COMPATREL}./g}
-
-.PATH:	${COMPATREL}${COMPATDIR}
+.PATH:	${COMPATDIR}
 
 SRCS=	compat_exec.c compat_util.c kern_exit_43.c kern_info_09.c \
 	kern_info_43.c kern_prot_43.c kern_resource_43.c kern_sig_43.c \
diff --git a/sys/compat/common/Makefile.inc b/sys/compat/common/Makefile.inc
index e817400d8c0..7e559d9bca0 100644
--- a/sys/compat/common/Makefile.inc
+++ b/sys/compat/common/Makefile.inc
@@ -1,21 +1,20 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1996/05/23 08:32:21 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 1997/05/30 09:40:57 niklas Exp $
 #	$NetBSD: Makefile.inc,v 1.5 1996/05/20 17:23:59 mrg Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
 
-COMPATDIR=	$S/compat/common
-
+PWD!=		pwd
+COMPATDIR!=	cd $S/compat/common; pwd
 COMPATDST?=	lib/compat
-COMPATREL?=	../../
 COMPATLIB=	${COMPATDST}/libcompat.a
 COMPATLIB_PROF=	${COMPATDST}/libcompat_p.a
 
 COMPATMAKE= \
-	cd ${COMPATDST} && ${MAKE} -f ${COMPATREL}${COMPATDIR}/Makefile \
-	    CC="${CC}" CFLAGS="${CFLAGS:S/-I./-I${COMPATREL}./g}" \
-	    LD="${LD}" \
-	    COMPATCPPFLAGS="${CPPFLAGS}" \
-	    COMPATREL="${COMPATREL}" \
+	cd ${COMPATDST} && ${MAKE} -f ${COMPATDIR}/Makefile \
+	    CC="${CC}" CFLAGS="${CFLAGS:S/-I./-I${PWD}\/./g}" \
+	    LD="${LD}" AR="${AR}" RANLIB="${RANLIB}" LORDER="${LORDER}" \
+	    NM="${NM}" \
+	    CPPFLAGS="${CPPFLAGS:S/-I./-I${PWD}\/./g}" \
 	    COMPATDIR="${COMPATDIR}"
 
 ${COMPATLIB}:		.NOTMAIN __always_make_compatlib