Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checking for the file "xserver" in "${OBSOLETE.dir}" doesn't work because 

the check will be done before the target which is used to create that file.
So simply add "xserver" to "${OBSOLETE.file}" based on the architecture.
This commit is contained in:
tron 2005-03-24 20:23:55 +00:00
parent 303cafe4e5
commit 728512171e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.308 2005/03/24 09:07:17 martin Exp $ # $NetBSD: Makefile,v 1.309 2005/03/24 20:23:55 tron Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values: # Environment variables without default values:
@ -340,8 +340,11 @@ OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
OBSOLETE.files= base comp etc games man misc text OBSOLETE.files= base comp etc games man misc text
.if ${MKX11} != "no" .if ${MKX11} != "no"
OBSOLETE.files+= xbase xcomp xfont OBSOLETE.files+= xbase xcomp xfont
.if exists(${OBSOLETE.dir}/xserver) .if ${MACHINE_ARCH} == "amd64" || \
# not all archs have obsolete files for the xserver set ${MACHINE_ARCH} == "cats" || \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "macppc" || \
${MACHINE_ARCH} == "sgimips"
OBSOLETE.files+= xserver OBSOLETE.files+= xserver
.endif .endif
.endif .endif
@ -616,3 +619,6 @@ clean:
-rm -rf ${CDROM.dir} ${CDROM.pathlist} ${OBSOLETE.dir} -rm -rf ${CDROM.dir} ${CDROM.pathlist} ${OBSOLETE.dir}
.include <bsd.prog.mk> .include <bsd.prog.mk>
test:
@echo ${OBSOLETE.files}