public inbox for dwz@sourceware.org
 help / color / mirror / Atom feed
From: Tom de Vries <tdevries@suse.de>
To: dwz@sourceware.org, jakub@redhat.com
Cc: Matthias Klose <doko@debian.org>
Subject: [committed] Handle running configure in source dir
Date: Tue, 01 Jan 2019 00:00:00 -0000	[thread overview]
Message-ID: <20190702083808.GA15199@delia> (raw)

Hi,

The configure script was added to facilitate building in a separate build dir
rather than in the source dir.  It does this by generating a Makefile in the
build dir that calls make using the Makefile in the source dir.

However, running the configure in the source dir overwrites the Makefile in
the source dir.

Fix this by detecting running configure in the source dir, and not generating
the unnecessary Makefile.

Committed to trunk.

Thanks,
- Tom

Handle running configure in source dir

2019-07-02  Tom de Vries  <tdevries@suse.de>

	* configure: Handle running in source dir.

---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure b/configure
index 24f3fd2..894f6be 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,12 @@
 #!/bin/sh
 srcdir=$(cd $(dirname $0); pwd -P)
 
+if [ "$srcdir" = "$(pwd -P)" ]; then
+    # We're not in a separate build dir, but in the source dir, we already
+    # have a Makefile.
+    exit 0
+fi
+
 cat > Makefile <<EOF
 srcdir:=$srcdir
 

                 reply	other threads:[~2019-07-02  8:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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

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

  git send-email \
    --in-reply-to=20190702083808.GA15199@delia \
    --to=tdevries@suse.de \
    --cc=doko@debian.org \
    --cc=dwz@sourceware.org \
    --cc=jakub@redhat.com \
    /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.
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).