-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
- @echo "Regenerating $(FPTOOLS_TOP)/configure..."
- @( cd $(FPTOOLS_TOP) && make -f Makefile.config ./configure )
+$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
+ @echo "Running autoreconf in $(FPTOOLS_TOP) ..."
+ @( cd $(FPTOOLS_TOP) && autoreconf )
+
+# -----------------------------------------------------------------------------
+# Misc bits
+
+# If $(way) is set then we define $(way_) and $(_way) from it in the
+# obvious fashion. This must be done before suffix.mk is included,
+# because the pattern rules in that file depend on these variables.
+
+ifneq "$(way)" ""
+ way_ := $(way)_
+ _way := _$(way)
+endif
+
+
+# When using $(patsubst ...) and friends, you can't use a literal comma
+# freely - so we use ${comma} instead. (See PACKAGE_CPP_OPTS in package.mk
+# for an example usage.)
+comma=,