unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: emacs-devel@gnu.org
Subject: Re-running configure automatically
Date: Wed, 17 Apr 2013 21:36:39 +0300	[thread overview]
Message-ID: <83li8h2edk.fsf@gnu.org> (raw)

We have a GNUmakefile file in the top-level directory, which makes it
easy to automatically reconfigure the tree when needed.

However, the Windows build needs to point the configure script at a
custom site file in nt/mingw-cfg.site.  So I'd like to arrange for
GNUmakefile and the subsequent invocation of Makefile, if it exists,
to honor that.

Is the following a correct and clean way of achieving that goal?

=== modified file 'GNUmakefile'
--- GNUmakefile	2013-01-01 09:11:05 +0000
+++ GNUmakefile	2013-04-17 18:29:42 +0000
@@ -32,6 +32,11 @@
 # run "configure" by hand.  But run autogen.sh first, if the source
 # was checked out directly from the repository.
 
+ifneq ($(MSYSTEM),)
+CFG = CONFIG_SITE=$(CURDIR)/nt/mingw-cfg.site
+else
+CFG =
+endif
 
 # If a Makefile already exists, just use it.
 
@@ -70,7 +75,7 @@ configure:
 Makefile: configure
 	@echo >&2 'There seems to be no Makefile in this directory.'
 	@echo >&2 'Running ./configure ...'
-	./configure
+	$(CFG) ./configure
 	@echo >&2 'Makefile built.'
 
 endif

=== modified file 'Makefile.in'
--- Makefile.in	2013-04-17 17:51:31 +0000
+++ Makefile.in	2013-04-17 18:32:10 +0000
@@ -393,9 +393,9 @@ $(MAKEFILE_NAME): config.status $(srcdir
 
 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
 	if [ -x ./config.status ]; then	\
-	    ./config.status --recheck;	\
+	    $(CFG) ./config.status --recheck;	\
 	else				\
-	    $(srcdir)/configure $(CONFIGURE_FLAGS); \
+	    $(CFG) $(srcdir)/configure $(CONFIGURE_FLAGS); \
 	fi
 
 AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4




             reply	other threads:[~2013-04-17 18:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-17 18:36 Eli Zaretskii [this message]
2013-04-17 18:50 ` Re-running configure automatically Paul Eggert
2013-04-17 19:46   ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83li8h2edk.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).