Subject: ../src -> $BSDSRCDIR
To: None <tech-x11@netbsd.org>
From: Hubert Feyrer <feyrer@rfhs8012.fh-regensburg.de>
List: tech-x11
Date: 02/23/2000 19:01:34
Can someone please sanity-check the changes below? 

It seems xsrc assumes there is a ../src, but that doesn't need to be the
case (I have src-current and src-1.4). Instead, use $BSDSRCDIR (and pull
in bsd.pkg.mk to get BSDSRCDIR defined).

OK to commit?


 - Hubert

-- 
NetBSD - Better for your uptime than Viagra

---------- Forwarded message ----------
Date: Wed, 23 Feb 2000 18:57:41 +0100 (MET)
From: Hubert Feyrer <feyrer@rfhs8012.fh-regensburg.de>
To: hubert.feyrer@rz.uni-regensburg.de

Index: Makefile
===================================================================
RCS file: /cvsroot/xsrc/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	1999/12/28 19:51:54	1.9
+++ Makefile	2000/02/23 17:58:33
@@ -24,6 +24,11 @@
 #
 # clean: Remove object files, but keep imake generated makefiles.
 
+.if exists(/etc/mk.conf)
+.include "/etc/mk.conf"
+.endif
+
+
 BSDSRCDIR?=	/usr/src
 
 all: all-xc all-contrib
@@ -92,7 +97,7 @@
 .endif # INSTALL_DONE or BUILD_DONE
 #
 	${INSTALL} -d -m 755 -o root -g wheel ${RELEASEDIR}/binary/sets
-	sh ${BSDSRCDIR}/distrib/sets/maketars -x -s ../src/distrib/sets \
+	sh ${BSDSRCDIR}/distrib/sets/maketars -x -s ${BSDSRCDIR}/distrib/sets \
 		-d ${DESTDIR} -t ${RELEASEDIR}/binary/sets
 	cd ${RELEASEDIR}/binary/sets && \
 		cksum -o 1 *.tgz >BSDSUM && \