diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2021-04-13 19:07:46 +0200 |
|---|---|---|
| committer | Ludovic Rousseau <ludovic.rousseau@free.fr> | 2021-04-14 16:51:09 +0200 |
| commit | 1001cb5558cf6679af7bce3114bba1d3bb7b6f7f (patch) | |
| tree | fa618d66afbfe7379161185918ff92b5381f9c6a | |
| parent | bda2344f5e7d460decd3968492faa7a5fb2797cd (diff) | |
| download | libusb-1001cb5558cf6679af7bce3114bba1d3bb7b6f7f.tar.gz | |
autogen: Support being called from external build dir
Building libusb from another build directory doesn't properly work right
now, as calling autogen.sh from there won't work.
An example is when using jhbuild to build it.
So always use absolute paths to call configure and bootstrap scripts
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rwxr-xr-x | bootstrap.sh | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -2,7 +2,9 @@ set -e -./bootstrap.sh +srcdir="$(dirname "$0")" + +"$srcdir"/bootstrap.sh if [ -z "$NOCONFIGURE" ]; then - exec ./configure --enable-examples-build --enable-tests-build "$@" + exec "$srcdir"/configure --enable-examples-build --enable-tests-build "$@" fi diff --git a/bootstrap.sh b/bootstrap.sh index cfd2b45..fc555d5 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,6 +2,8 @@ set -e +cd "$(dirname "$0")" + if [ ! -d m4 ]; then mkdir m4 fi diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 1dd1b6a..8d36b28 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11608 +#define LIBUSB_NANO 11609 |