2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 96a76f5..faac812 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,9 @@ ifneq ($(wildcard setarch-aliases.d/*),)
 endif
 
 
-edit = sed -e "s|@pkgdatadir[@]|$(DATADIR)|g"
+edit = sed \
+	-e "s|@pkgdatadir[@]|$(DATADIR)|g" \
+	-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g"
 GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
 
 define buildInScript
@@ -76,7 +78,7 @@ $(1)/%: $(2)%$(3)
 	$$(GEN_MSG)
 	@mkdir -p $$(dir $$@)
 	@$(RM) "$$@"
-	@{ echo -n 'm4_changequote([[[,]]])'; cat $$<; } | m4 -P --define=m4_devtools_version=$$(BUILDTOOLVER) | $(edit) >$$@
+	@cat $$< | $(edit) >$$@
 	@chmod $(4) "$$@"
 	@bash -O extglob -n "$$@"
 endef
diff --git a/src/lib/common.sh b/src/lib/common.sh
index 1fe396c..51ab2fd 100644
--- a/src/lib/common.sh
+++ b/src/lib/common.sh
@@ -17,7 +17,7 @@ export LANG=C
 
 # Set buildtool properties
 export BUILDTOOL=devtools
-export BUILDTOOLVER=m4_devtools_version
+export BUILDTOOLVER=@buildtoolver@
 
 # Set common properties
 export PACMAN_KEYRING_DIR=/etc/pacman.d/gnupg