From nobody Thu Dec 07 00:46:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SlwbB3Jr4z53Gtc; Thu, 7 Dec 2023 00:47:18 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0b-00273201.pphosted.com [67.231.152.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "Sectigo RSA Organization Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Slwb913cDz4Ngc; Thu, 7 Dec 2023 00:47:17 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=juniper.net header.s=PPS1017 header.b=W9oDFjo7; dkim=pass header.d=juniper.net header.s=selector1 header.b=j7jscoX2; spf=pass (mx1.freebsd.org: domain of sjg@juniper.net designates 67.231.152.164 as permitted sender) smtp.mailfrom=sjg@juniper.net; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=reject) header.from=juniper.net Received: from pps.filterd (m0108162.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3B6KX8qt028612; Wed, 6 Dec 2023 16:47:15 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-transfer-encoding : date : message-id; s=PPS1017; bh=Ku+1KZue9H2UvyWyE5PGwKkSZ5WGVVsqrAId8XjeBjM=; b=W9oDFjo7urTb1e1a8+2+dm1B/JUav96dVaieHXEGTJfswFt0Zb+sViTtPStsJmu/n39F X94GpCt2KQSpc44KnRWq5i5+QTLCGTjDL8W6wTL0ACUw2NXUYB1R4zG7EYWdZ6MS8SVv 8RGUP3faHAZjeRzTo4hH3oG+WTYb548j0ae6V91XtLx0KStXr8i613JGXnR7scmpOwQZ cjdJjJvdqSj75hMvm0E3BK8r+SYEWVBd4dNbBShCXgwjMVhTpY47n963BoZ3mUpY/tur E9NjubzWS0OwHRIPJmWuxUZAXnGL07GyOOAvS/gmSy590Fc42i1YpFmr7rKpFFz3a/7s Ug== Received: from co1pr02cu001.outbound.protection.outlook.com (mail-westus2azlp17011017.outbound.protection.outlook.com [40.93.10.17]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 3uu039gn5d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Dec 2023 16:47:15 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BpTraGiBWNWnbBSZZ687ZQU1KAWywJq0gXNGJbotBEH8/c9RVyDqdkVAyvb/f1HqXOgXrPVv+XOg0PLOsLr7fBJe2yvdgLhxql0MrdG/pYqpe5dpXEzEOZ6UFRdASYnZhkYQ8j//RGOWuq5XFEtFwUGBpXUOSsafvnpzmjYVXMFONiwQ+he1LYpGQm1aZdbESvsltX40Oveo8xynrmO/tkRvHC4PQ8uOlFofrGEmFwcqKb8vISuNbmMrwNFnEswjJIRGgbP+B11pvhX2CT9k5DzqgcH9OlKVzD0JAxJ7uzQGkeF7t+K5G7H8u1GgEFHg0/X+qne9vnJ8RbNnQRx2gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ku+1KZue9H2UvyWyE5PGwKkSZ5WGVVsqrAId8XjeBjM=; b=SY2AbFkkppYePvgUD4XC/TgNKo+XoRnhkI6dhfKiZngd0UyUfkpO1BcpCIZojzk/vjg2dQpEzRva20xDeLa/QdL373iscE8sOiqhgyTUpGqKtKG6rInhZgMbQfUP5GeuToBu085brYa2AukuD9FOWCC5bWPTAFkvUZyRF7u/lM0xl9xi0BbFrDcoYkZ/p+081uQo0kSrSQfO62TiQYCq6D2Ftdf88FG9a0ggvjG3RfVinIpCbsb3vnhJkl8IXgQYH0TRJhv4TogpcsoeRW5D2iGa3V70MTaCup8D8Glqm0nV/XeOrfNmHQ1/7quppIQcuzGT1ycVuihLzwW7cCorYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.242.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Ku+1KZue9H2UvyWyE5PGwKkSZ5WGVVsqrAId8XjeBjM=; b=j7jscoX2av6uonNxylSumbzvg1jmX1MaaW7JHLmRvrQYUylZM16AwcRkXvJZct1N6WnxyjqQ2Fp4tgbnFjKiZKM8BQs4weImfkFz1pieOy87SjQnLwCDIhC+4vkvyD/lOfWL+OPPecOhE0dmEq3zyZNIK7Ow2MTuD4QbxoxSvL0= Received: from DM6PR02CA0064.namprd02.prod.outlook.com (2603:10b6:5:177::41) by SA1PR05MB8178.namprd05.prod.outlook.com (2603:10b6:806:1b5::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.25; Thu, 7 Dec 2023 00:47:10 +0000 Received: from DM6NAM12FT042.eop-nam12.prod.protection.outlook.com (2603:10b6:5:177:cafe::b) by DM6PR02CA0064.outlook.office365.com (2603:10b6:5:177::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.32 via Frontend Transport; Thu, 7 Dec 2023 00:47:09 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.242.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.242.14 as permitted sender) Received: from p-exchfe-eqx-01.jnpr.net (66.129.242.14) by DM6NAM12FT042.mail.protection.outlook.com (10.13.178.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.13 via Frontend Transport; Thu, 7 Dec 2023 00:47:09 +0000 Received: from p-exchbe-eqx-02.jnpr.net (10.104.9.15) by p-exchfe-eqx-01.jnpr.net (10.104.9.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 6 Dec 2023 18:47:09 -0600 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-02.jnpr.net (10.104.9.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39 via Frontend Transport; Wed, 6 Dec 2023 18:47:09 -0600 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 3B70l8kZ025461; Wed, 6 Dec 2023 16:47:08 -0800 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id 1BEE54D2F8; Wed, 6 Dec 2023 16:46:40 -0800 (PST) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 1B60B4D4D0; Wed, 6 Dec 2023 16:46:40 -0800 (PST) To: Jessica Clarke CC: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Subject: Re: git: 0c3627f44d49 - main - bsdinstall avoid subdir depending on parent In-Reply-To: <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> References: <202304210501.33L51PBT011707@gitrepo.freebsd.org> <09DDC25F-63F8-440A-A674-31F190C087B4@freebsd.org> <107720F5-1196-4E6C-AABE-48285D7B18B2@freebsd.org> Comments: In-reply-to: Jessica Clarke message dated "Tue, 05 Dec 2023 22:39:18 +0000." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.8; GNU Emacs 28.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Date: Wed, 6 Dec 2023 16:46:40 -0800 Message-ID: <69192.1701910000@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM12FT042:EE_|SA1PR05MB8178:EE_ X-MS-Office365-Filtering-Correlation-Id: dfbfeb87-14b1-49d1-5c10-08dbf6be0b59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QCS74Ysvd1HHjQ9E16f+yIPDn65uLCpzVzypTZ+m5QgxbZZBg/R3dw6FBTAx8KyrirRrBK1PI5L6RfY3ougoGnI2hqBbfc2WGBWcZR8VueMhOldbAqRURjPBWNIGgFD7ltgiIBrkaRalWHrs2r0e/c/tjIMhxMo9DUvP6OxeawQKblddQZ+2lrlx5kjhtj567cSHCjzZBzGbZ/zwuQk5JZwkAycVkiNYEkVYYBQ0TlRP1cFMF9jfjdHQQPC2nQWSqd5LPFNC5iMVZT0P0EGQDNjqhcziwkrOauDqhfT6jYGJAVUHVFtoiH+IOTl8P1VYtqoyimBmlIkG5CMFfiaSEWSJ0DY+US27otgtXMbSFQSsMPQa01iZ/DUuIhid0EXXpbFq77nqt3I/Mq6dXZfk1gInCnqmUbHKlyBkrPR74Qca+y83SmDB28z4bCPyUD5lZmCgl2AB5C3zwYhAcNPsTDsLe3J1pPyK5hFU96On/C9a4/ZxSWWchp/ZlpFnYeUiqFyuBod0xQUl6eeAvHARQZRfd+DHhizwiOef89e7tjmrnI17wazdcviELYR4H1+kWddQJfmHC+j6XRcn3x5n8t7u33B+1NE/tAPEhmu4MUccpHpxKPsf/A/gwA1Kdm96tBf2iPgrP/hzE/8cBOfd816Ohi8d5QkF5kRr5z8ysZRGtDeHL4uCU4zUIip3vtsMK6mEZkSQKV82+SGqvzQDOPjFZkfi+mDkKzSj9pHaM7vPkIsXUy5H91TIB00mc4GCdy59k1Bkykho89Lsm5EGL36L3y3gZewNOTFlvnMy0ippPFnnn2HnIlANyWvEc/u3 X-Forefront-Antispam-Report: CIP:66.129.242.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-01.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(136003)(376002)(39860400002)(346002)(396003)(230922051799003)(186009)(451199024)(1800799012)(82310400011)(64100799003)(36840700001)(40470700004)(46966006)(40460700003)(316002)(54906003)(450100002)(86362001)(8936002)(8676002)(6916009)(4326008)(966005)(478600001)(70586007)(70206006)(41300700001)(2906002)(47076005)(81166007)(36860700001)(356005)(9686003)(26005)(7126003)(107886003)(53546011)(83380400001)(7696005)(82740400003)(5660300002)(336012)(6266002)(40480700001)(84970400001)(55016003)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2023 00:47:09.6744 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dfbfeb87-14b1-49d1-5c10-08dbf6be0b59 X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.242.14];Helo=[p-exchfe-eqx-01.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT042.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR05MB8178 X-Proofpoint-GUID: 9n1o-Kb1WxvPqfhV2G8vH20ui-voFqhn X-Proofpoint-ORIG-GUID: 9n1o-Kb1WxvPqfhV2G8vH20ui-voFqhn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-06_22,2023-12-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 malwarescore=0 priorityscore=1501 suspectscore=0 spamscore=0 mlxlogscore=999 clxscore=1011 impostorscore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2312070005 X-Spamd-Result: default: False [-5.10 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[juniper.net,reject]; R_DKIM_ALLOW(-0.20)[juniper.net:s=PPS1017,juniper.net:s=selector1]; R_SPF_ALLOW(-0.20)[+ip4:67.231.152.164]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[67.231.152.164:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US]; RCVD_IN_DNSWL_NONE(0.00)[40.93.10.17:received]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; REDIRECTOR_URL(0.00)[urldefense.com]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[sjg]; DKIM_TRACE(0.00)[juniper.net:+]; TO_DN_SOME(0.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_EQ_ADDR_SOME(0.00)[] X-Rspamd-Queue-Id: 4Slwb913cDz4Ngc X-Spamd-Bar: ----- Jessica Clarke wrote: > On 21 Apr 2023, at 06:14, Jessica Clarke wrote: Sorry, I didn't your mail back in April. I can move the generation of the header to its own subdir. Does usr.sbin/bsdinstall/osname sound reasonable? other common options would include gen/ include/ inc/ ? > > On 21 Apr 2023, at 06:01, Simon J. Gerraty wrote: > >> > >> The branch main has been updated by sjg: > >> > >> URL: https://urldefense.com/v3/__https://cgit.FreeBSD.org/src/commit/?= id=3D0c3627f44d49b460d5b9156145dec9d4a91beb2c__;!!NEt6yMaO-gk!CduM38y2LXW3s= nhYZYZdtUNWv4VGMwaMwEOIOUMDYGZMRJwin7i46yHWwp5pG_pq3GGTzT-7Czg7AA$ > >> > >> commit 0c3627f44d49b460d5b9156145dec9d4a91beb2c > >> Author: Simon J. Gerraty > >> AuthorDate: 2023-04-21 05:00:40 +0000 > >> Commit: Simon J. Gerraty > >> CommitDate: 2023-04-21 05:00:40 +0000 > >> > >> bsdinstall avoid subdir depending on parent > >> > >> When not doing tree walks, it is bad for sub-dirs to depend on > >> parents. Move the generation of opt_osname.h to distextract > >> and have others that need that depend on it. > >> > >> In usr.sbin/bsdinstall use SUBDIR_DEPEND_ so tree walking still work= s. > >> > >> Reviewed by: obrien > >> Differential Revision: https://urldefense.com/v3/__https://reviews.= freebsd.org/D39742__;!!NEt6yMaO-gk!CduM38y2LXW3snhYZYZdtUNWv4VGMwaMwEOIOUMD= YGZMRJwin7i46yHWwp5pG_pq3GGTzT_oIs2qhw$ > >> --- > >> usr.sbin/bsdinstall/Makefile | 9 ++------- > >> usr.sbin/bsdinstall/distextract/Makefile | 11 ++++++++++- > >> usr.sbin/bsdinstall/distfetch/Makefile | 2 +- > >> usr.sbin/bsdinstall/partedit/Makefile | 2 +- > >> 4 files changed, 14 insertions(+), 10 deletions(-) > >> > >> diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefi= le > >> index e71cae726536..aaa006694222 100644 > >> --- a/usr.sbin/bsdinstall/Makefile > >> +++ b/usr.sbin/bsdinstall/Makefile > >> @@ -3,19 +3,14 @@ > >> OSNAME?=3D FreeBSD > >> SUBDIR=3D distextract distfetch partedit runconsoles scripts > >> SUBDIR_PARALLEL=3D > >> +SUBDIR_DEPEND_distfetch =3D distextract > >> +SUBDIR_DEPEND_partedit =3D distextract > >> SCRIPTS=3D bsdinstall > >> MAN=3D bsdinstall.8 > >> PACKAGE=3D bsdinstall > >> -GENHDRS=3D opt_osname.h > >> -SRCS+=3D ${GENHDRS} > >> -CLEANFILES+=3D ${GENHDRS} > >> > >> SCRIPTS+=3D startbsdinstall > >> SCRIPTSDIR_startbsdinstall=3D ${LIBEXECDIR}/bsdinstall > >> > >> -opt_osname.h: .PHONY > >> - if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > >> - echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > >> - fi > >> > >> .include > >> diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdin= stall/distextract/Makefile > >> index 6ae9bb65e8fb..0292c01e78f4 100644 > >> --- a/usr.sbin/bsdinstall/distextract/Makefile > >> +++ b/usr.sbin/bsdinstall/distextract/Makefile > >> @@ -2,9 +2,18 @@ > >> > >> BINDIR=3D ${LIBEXECDIR}/bsdinstall > >> PROG=3D distextract > >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I. > >> LIBADD=3D archive bsddialog m > >> +SRCS=3D distextract.c > >> > >> MAN=3D > >> +GENHDRS=3D opt_osname.h > >> +SRCS+=3D ${GENHDRS} > >> +CLEANFILES+=3D ${GENHDRS} > >> + > >> +opt_osname.h: .PHONY > >> + if ! grep -q "^#define OSNAME \"${OSNAME}\"$"" ${.TARGET}; then \ > >> + echo "#define OSNAME \"${OSNAME}\"" > ${.TARGET}; \ > >> + fi > >> > >> .include > >> diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinst= all/distfetch/Makefile > >> index 0104df0e3aec..1555719dd15d 100644 > >> --- a/usr.sbin/bsdinstall/distfetch/Makefile > >> +++ b/usr.sbin/bsdinstall/distfetch/Makefile > >> @@ -2,7 +2,7 @@ > >> > >> BINDIR=3D ${LIBEXECDIR}/bsdinstall > >> PROG=3D distfetch > >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextr= act > >> LIBADD=3D fetch bsddialog > >> > >> MAN=3D > >> diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinsta= ll/partedit/Makefile > >> index 96c4ddb53961..df17028eab2a 100644 > >> --- a/usr.sbin/bsdinstall/partedit/Makefile > >> +++ b/usr.sbin/bsdinstall/partedit/Makefile > >> @@ -5,7 +5,7 @@ PROG=3D partedit > >> LINKS=3D ${BINDIR}/partedit ${BINDIR}/autopart \ > >> ${BINDIR}/partedit ${BINDIR}/scriptedpart > >> SYMLINKS=3D ../libexec/bsdinstall/partedit /usr/sbin/sade > >> -CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/.. > >> +CFLAGS+=3D -I${SRCTOP}/contrib/bsddialog/lib -I${.OBJDIR}/../distextr= act > > > > Surely this is a sign that this is a worse solution? The header isn=E2= =80=99t a > > part of distextract any more than partedit, so this is entirely > > arbitrary. It also blocks the ability to do the subdirectories in > > parallel with each other. > > > > I would much rather this reverted; this feels like a regression to me, > > with the only justification being that it =E2=80=9Cis bad=E2=80=9D, acc= ording to your > > commit message, but so is this, and I would argue it=E2=80=99s worse. > > > > Or go put it in its own common directory. >=20 > This was never addressed. Moreover, the current code is in fact broken; > OSNAME is not defined within distextract=E2=80=99s Makefile, only the par= ent=E2=80=99s, > so opt_osname.h ends up with #define OSNAME "" in it. I guess I=E2=80=99m= the > first to notice that the top left of the screen says " Installer" > during 14.0=E2=80=99s distextract. >=20 > I am therefore once again asking for this commit to be reverted, but > this time because it doesn=E2=80=99t work, not just because I disagree wi= th the > design.