From 9c461cf84aa00d945f5001a467fd59d354491ff2 Mon Sep 17 00:00:00 2001 From: "Peter S. Housel" Date: Sat, 4 Jan 2025 10:34:20 -0800 Subject: [PATCH] Build: Fix path substitution for the batteries-included build This commit changes the batteries-included build so that the $(SYSTEM_ROOT) relative path transformation in config.jam is only done within the final release directory rather than polluting the build directory. * Makefile.in (dist): Always perform the relative path transformation in the config.jam file in the release directory. * build/unix/release-with-batteries.sh: Use the standard dist make target rather than doing the relative path transformation interspersed with the build. --- Makefile.in | 1 + build/unix/release-with-batteries.sh | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index a7bbcca5c..bf18b2bcc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -361,6 +361,7 @@ dist: 3-stage-bootstrap -cp -R Bootstrap.3/include/opendylan release/opendylan-$(version)/include cp -R Bootstrap.3/lib release/opendylan-$(version)/ cp -R Bootstrap.3/share/opendylan release/opendylan-$(version)/share + sed "s;`pwd`/release/opendylan-$(version);\$$(SYSTEM_ROOT);g" sources/jamfiles/config.jam >release/opendylan-$(version)/share/opendylan/build-scripts/config.jam cp -R $(srcdir)/tools/lldb release/opendylan-$(version)/share/opendylan cp -R $(srcdir)/tools/bash_completion release/opendylan-$(version)/share/opendylan cp $(srcdir)/License.txt release/opendylan-$(version)/ diff --git a/build/unix/release-with-batteries.sh b/build/unix/release-with-batteries.sh index 6801d6354..6a639c5d3 100755 --- a/build/unix/release-with-batteries.sh +++ b/build/unix/release-with-batteries.sh @@ -171,9 +171,4 @@ $top_srcdir/configure CC="$CC" CXX="$CXX" \ echo "RTLIBS_INSTALL += ${RTLIBS_INSTALL} ;" >>sources/jamfiles/config.jam -${MAKE} 3-stage-bootstrap DYLAN_JOBS=${DYLAN_JOBS} - -sed -i~ "s;${DISTDIR};\$(SYSTEM_ROOT);g" sources/jamfiles/config.jam -rm sources/jamfiles/config.jam~ - -${MAKE} dist +${MAKE} dist DYLAN_JOBS=${DYLAN_JOBS}