diff options
-rw-r--r-- | Makefile | 4 | ||||
-rwxr-xr-x | configure | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -25,13 +25,15 @@ srcdir ?= . include Makefile.config Makefile.config: $(srcdir)/configure +ifeq ($(configure_options),) @echo "" @echo "Note: Calling ./configure with no command-line arguments. This is often fine," @echo " but if you want to specify any arguments (such as an alternate prefix" @echo " into which to install), call ./configure explicitly and then make again." @echo " See \"./configure --help\" for more details." @echo "" - ./configure +endif + $(srcdir)/configure $(configure_options) # Finally, include all of the Makefile.local fragments where all the # real work is done. @@ -529,8 +529,13 @@ cat > Makefile.config <<EOF # changes, (and this could happen by simply calling "make" if the # configure script is updated). +# The top-level directory for the source, (the directory containing +# the configure script). This may be different than the build +# directory (the current directory at the time configure was run). srcdir = ${srcdir} +configure_options = $@ + # We use vpath directives (rather than the VPATH variable) since the # VPATH variable matches targets as well as prerequisites, (which is # not useful since then a target left-over from a srcdir build would |