diff options
| author | Andrea Bolognani <abologna@redhat.com> | 2020-04-17 22:20:26 +0200 |
|---|---|---|
| committer | Andrea Bolognani <abologna@redhat.com> | 2020-04-20 09:18:38 +0200 |
| commit | 8ba5cd3f3005f727b2e829edfedde42a6611e0e3 (patch) | |
| tree | 18dfce013c1bc9cd88873d916413a575b873ce6c /prepare-release.sh | |
| parent | 1b8e57156f2950a889549274d7e9d87bc571602a (diff) | |
| download | libosinfo-8ba5cd3f3005f727b2e829edfedde42a6611e0e3.tar.gz | |
prepare-release: Define DIST_ROOT
This is the subdirectory of BUILD_ROOT where the release archive
is generated by Meson: it's already used multiple times, and we're
about to introduce another one, so let's give it its own variable.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Diffstat (limited to 'prepare-release.sh')
| -rwxr-xr-x | prepare-release.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/prepare-release.sh b/prepare-release.sh index 0d48ea2..1baba0a 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -6,6 +6,7 @@ set -v BUILD_ROOT="$PWD/build" INSTALL_ROOT="$PWD/install" RPMBUILD_ROOT="$PWD/rpmbuild" +DIST_ROOT="$BUILD_ROOT/native/meson-dist" # Make things clean. rm -rf "$BUILD_ROOT" "$INSTALL_ROOT" "$RPMBUILD_ROOT" @@ -25,7 +26,7 @@ ninja -C "$BUILD_ROOT/native" dist if test -x /usr/bin/rpmbuild; then rpmbuild --nodeps \ --define "_topdir $RPMBUILD_ROOT" \ - --define "_sourcedir $BUILD_ROOT/native/meson-dist/" \ + --define "_sourcedir $DIST_ROOT" \ -ba --clean "$BUILD_ROOT/native/libosinfo.spec" fi @@ -66,6 +67,6 @@ if test -x /usr/bin/i686-w64-mingw32-gcc && \ test -x /usr/bin/rpmbuild; then rpmbuild --nodeps \ --define "_topdir $RPMBUILD_ROOT" \ - --define "_sourcedir $BUILD_ROOT/native/meson-dist/" \ + --define "_sourcedir $DIST_ROOT" \ -ba --clean "$BUILD_ROOT/native/mingw-libosinfo.spec" fi |