From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re-running configure automatically Date: Wed, 17 Apr 2013 21:36:39 +0300 Message-ID: <83li8h2edk.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1366223817 27537 80.91.229.3 (17 Apr 2013 18:36:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 17 Apr 2013 18:36:57 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 17 20:37:01 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1USXE1-0002NI-MI for ged-emacs-devel@m.gmane.org; Wed, 17 Apr 2013 20:36:57 +0200 Original-Received: from localhost ([::1]:39131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USXE1-0000BO-9y for ged-emacs-devel@m.gmane.org; Wed, 17 Apr 2013 14:36:57 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USXDw-00006s-31 for emacs-devel@gnu.org; Wed, 17 Apr 2013 14:36:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1USXDu-0007Ie-MU for emacs-devel@gnu.org; Wed, 17 Apr 2013 14:36:52 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:64136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1USXDu-0007IO-EH for emacs-devel@gnu.org; Wed, 17 Apr 2013 14:36:50 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0MLE00C00WYE1W00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Wed, 17 Apr 2013 21:36:23 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MLE00BVAX0NQD70@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Wed, 17 Apr 2013 21:36:23 +0300 (IDT) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:158983 Archived-At: 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