# for all FILE in AT_FILES:
# substitute occurrences of @FILE@ with contents $(at-dir)BLA$(at-ext)
sed-atfiles = -e '\#' $(foreach i, $(AT_FILES), \
- -e '/@$i@/r $(at-dir)$i$(at-ext)' -e 's%@$i@%%g')
+ -e '/@$i@/r $(at-dir)/$i$(at-ext)' -e 's%@$i@%%g')
# for all VAR in ATVARIABLES
# substitute occurrences of @VAR@ with $(VAR)
sed-atvariables = -e '\#' $(foreach i, $(ATVARIABLES), -e 's!@$i@!$($i)!g')
-# these are obsolete
-
-# then remove them --hwn
-
-# use ATVARIABLES
-sed-date=sed 's!@DATE@!${date}!g'
-sed-PACKAGE = sed 's!@PACKAGE@!${PACKAGE}!g'
-sed-bash = sed 's!@BASH@!$(BASH)!'
-sed-dir-datadir = sed 's!@DIR_DATADIR@!$(DIR_DATADIR)!'
-sed-package=sed 's!@package@!${package}!g'
-sed-perl = sed 's!@PERL@!$(PERL)!'
-sed-python = sed 's!@PYTHON@!$(PYTHON)!'
-sed-sh = sed 's!@SH@!$(SH)!'
-sed-shell = sed 's!@SH@!$(SHELL)!' | sed 's!@BASH@!$(BASH)!'
-sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-sed-step-bindir = sed 's!@STEP_BINDIR@!$(pwd)/$(step-bindir)!'