summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2018-12-25 18:14:24 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2018-12-25 18:14:24 (EST)
commitea7953fea5083082986787136ebec7a7a77593a3 (patch)
treed42489a591933ccf0c79e3de0118673809ec4465
parentab654dadd640164b7ddf01a3599c2a8beb6d6302 (diff)
opkbuild: Don't ignore errors from `../build build`
-rw-r--r--NEWS2
-rw-r--r--src/opkbuild.sh4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index a09ad5a..d5af6e9 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ Changes in this release:
ob_parse_version(), ob_parse_package_metadata(), and
ob_get_binary_packages() that affects GNU Bash and possibly other
shells has been fixed.
+ * A bug in opkbuild that would ignore errors from the "build"
+ makefile's "build" target has been fixed.
* The minimum version of the GNU General Public License has been
bumped to version 3.
diff --git a/src/opkbuild.sh b/src/opkbuild.sh
index fbd0d7d..9f3de2c 100644
--- a/src/opkbuild.sh
+++ b/src/opkbuild.sh
@@ -311,8 +311,8 @@ build()
{
case "${opt_target}" in
'')
- ../build build
- ${opt_uid0_cmd} -- ../build install && \
+ ../build build && \
+ ${opt_uid0_cmd} -- ../build install && \
${opt_uid0_cmd} -- '${BINDIR}/ob-installdocs' && \
${opt_uid0_cmd} -- '${BINDIR}/ob-gencontrol' && \
${opt_uid0_cmd} -- '${BINDIR}/ob-buildopk' && \