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

@@ -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)/

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}