Browse Source

20191213 conf/substitutions.conf.FreeBSD (HEAP_SUFFIX kann seit smlnj-110.95r6028 auch amd64-bsd sein dank 64-bit runtime)

Altlast 4 years ago
parent
commit
0a9d678c91
2 changed files with 6 additions and 4 deletions
  1. 6 3
      conf/Makefile
  2. 0 1
      conf/substitutions.conf.FreeBSD

+ 6 - 3
conf/Makefile

@@ -12,8 +12,11 @@ substitutions.conf: substitutions.conf.default substitutions.conf.local
 	cp -p substitutions.conf.local $@
 	awk '{ print $$1 }' substitutions.conf.local | fgrep -v -h -f - substitutions.conf.default >> $@
 
-substitutions.conf.default: substitutions.conf.franchise substitutions.conf.FreeBSD substitutions.conf.Linux
-	cat substitutions.conf.franchise substitutions.conf.`uname` > $@
+substitutions.conf.default: substitutions.conf.franchise substitutions.conf.heapsuffix substitutions.conf.FreeBSD substitutions.conf.Linux
+	cat substitutions.conf.franchise substitutions.conf.heapsuffix substitutions.conf.`uname` > $@
+
+substitutions.conf.heapsuffix:
+	echo "HEAP_SUFFIX		`sml @SMLsuffix`" > $@
 
 substitutions.conf.local:
 	[ -e $@ ] || \
@@ -21,5 +24,5 @@ substitutions.conf.local:
 	  if [ -e $$ETC_CONF ] ; then ln -s $$ETC_CONF $@ ; else touch $@ ; fi ; }
 
 clean:
-	rm -f substitutions.sed substitutions.conf substitutions.conf.default
+	rm -f substitutions.sed substitutions.conf substitutions.conf.default substitutions.conf.heapsuffix
 	[ -L substitutions.conf.local ] && rm -f substitutions.conf.local || [ -s substitutions.conf.local ] || rm -f substitutions.conf.local

+ 0 - 1
conf/substitutions.conf.FreeBSD

@@ -3,7 +3,6 @@ EXPORT_DIR		/var/tmp/node_exporter
 EXPORT_DIR_CHOWN	chown nobody:nogroup
 EXPORT_DIR_INSTALL	install -d -o nobody -g nobody -m 1755
 RUN_SML			/usr/local/smlnj/bin/.run-sml
-HEAP_SUFFIX		x86-bsd
 HEAP_INSTALL_FILES
 BIN_DIR			/usr/local/bin
 # keep this: