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] Fix hardcoded path in configure
Date: Tue, 01 Jan 2019 00:00:00 -0000	[thread overview]
Message-ID: <20190702083741.GA15156@delia> (raw)

Hi,

The configure script generates a Makefile containing:
...
srcdir:=$(shell pwd -P)/../src
...
which assumes that the sources are located in a $build/../src directory.

Fix this by getting the source path using the path to the configure script.

Committed to trunk.

Thanks,
- Tom

Fix hardcoded path in configure

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

	PR dwz/24755
	* configure: Don't assume sources are in $build/../src.

---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 92a02e7..24f3fd2 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,8 @@
 #!/bin/sh
+srcdir=$(cd $(dirname $0); pwd -P)
 
 cat > Makefile <<EOF
-srcdir:=\$(shell pwd -P)/../src
+srcdir:=$srcdir
 
 default:
 	\$(MAKE) -f \$(srcdir)/Makefile srcdir=\$(srcdir)

                 reply	other threads:[~2019-07-02  8:37 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=20190702083741.GA15156@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).