Fri Apr 26 18:06:02 2024 UTC (13d)
PR/58200: Kouichi Hashikawa: ./makeobsolete uses platform's sed


(christos)
diff -r1.469 -r1.470 src/etc/Makefile
cvs diff -r1.469 -r1.470 src/etc/Makefile (expand / switch to unified diff)

--- src/etc/Makefile 2023/11/10 20:44:58 1.469
+++ src/etc/Makefile 2024/04/26 18:06:02 1.470
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.469 2023/11/10 20:44:58 christos Exp $ 1# $NetBSD: Makefile,v 1.470 2024/04/26 18:06:02 christos Exp $
2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95 2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
3 3
4# Environment variables without default values: 4# Environment variables without default values:
5# DESTDIR must be set before anything in this file will work. 5# DESTDIR must be set before anything in this file will work.
6# RELEASEDIR is where the tarred up stuff for a snapshot or 6# RELEASEDIR is where the tarred up stuff for a snapshot or
7# release will be placed. 7# release will be placed.
8# 8#
9# Environment variables with default values: 9# Environment variables with default values:
10# LOCALTIME will set the default local time for the system you 10# LOCALTIME will set the default local time for the system you
11# build; it determines what /etc/localtime is symlink'd to. 11# build; it determines what /etc/localtime is symlink'd to.
12# KERNSRCDIR points to kernel source; it is set by default to ../sys, 12# KERNSRCDIR points to kernel source; it is set by default to ../sys,
13# but can be overridden. 13# but can be overridden.
14# KERNOBJDIR is the kernel build directory, it defaults to 14# KERNOBJDIR is the kernel build directory, it defaults to
@@ -383,30 +383,30 @@ OBSOLETE.files+= tests @@ -383,30 +383,30 @@ OBSOLETE.files+= tests
383.endif 383.endif
384.if ${MKX11} != "no" 384.if ${MKX11} != "no"
385OBSOLETE.files+= xbase xcomp xetc xfont xserver 385OBSOLETE.files+= xbase xcomp xetc xfont xserver
386.if ${MKDEBUG} != "no" 386.if ${MKDEBUG} != "no"
387OBSOLETE.files+= xdebug 387OBSOLETE.files+= xdebug
388.endif 388.endif
389.endif 389.endif
390 390
391# XXX make "makeobsolete" set wise; then generate files respectively 391# XXX make "makeobsolete" set wise; then generate files respectively
392install-obsolete-lists: .PHONY .MAKE 392install-obsolete-lists: .PHONY .MAKE
393 mkdir -p ${OBSOLETE.dir} 393 mkdir -p ${OBSOLETE.dir}
394.if ${MKX11} != "no" 394.if ${MKX11} != "no"
395 (cd ${NETBSDSRCDIR}/distrib/sets && \ 395 (cd ${NETBSDSRCDIR}/distrib/sets && \
396 AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir}) 396 AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -b -t ${OBSOLETE.dir})
397.else 397.else
398 (cd ${NETBSDSRCDIR}/distrib/sets && \ 398 (cd ${NETBSDSRCDIR}/distrib/sets && \
399 AWK=${TOOL_AWK:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir}) 399 AWK=${TOOL_AWK:Q} SED=${TOOL_SED:Q} MAKE=${MAKE:Q} ${HOST_SH} ./makeobsolete -t ${OBSOLETE.dir})
400.endif 400.endif
401.for file in ${OBSOLETE.files} 401.for file in ${OBSOLETE.files}
402 ${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file} 402 ${_MKMSG_INSTALL} ${DESTDIR}/var/db/obsolete/${file}
403 if [ ! -e ${DESTDIR}/var/db/obsolete/${file} ] || \ 403 if [ ! -e ${DESTDIR}/var/db/obsolete/${file} ] || \
404 ! cmp -s ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete/${file}; then \ 404 ! cmp -s ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete/${file}; then \
405 ${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \ 405 ${ETC_INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m 644 \
406 ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete; \ 406 ${OBSOLETE.dir}/${file} ${DESTDIR}/var/db/obsolete; \
407 else true; fi 407 else true; fi
408.endfor 408.endfor
409 409
410 410
411# distrib-dirs -- 411# distrib-dirs --
412# Populate $DESTDIR with directories needed by NetBSD 412# Populate $DESTDIR with directories needed by NetBSD