Permalink
Browse files

Cleanup build scripts

  • Loading branch information...
Chocobo1 committed Dec 21, 2018
1 parent 8aa2789 commit 6bd5d0b8e9e07e7946f3ad3ca5d88cd12f197970
Showing with 21 additions and 31 deletions.
  1. +8 −12 configure
  2. +7 −10 configure.ac
  3. +2 −4 macxconf.pri
  4. +4 −5 unixconf.pri
@@ -8433,21 +8433,17 @@ fi

fi



{ $as_echo "$as_me:${as_lineno-$LINENO}: Running qmake to generate the makefile..." >&5
$as_echo "$as_me: Running qmake to generate the makefile..." >&6;}
CONFDIR="$( cd "$( dirname "$0" )" && pwd )"

$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"

ret="$?"
TOPDIR="$(cd "$(dirname "$0")" && pwd)"
$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
qmake_ret="$?"

$as_echo
if test "x$ret" = "x0"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: Good, your configure finished." >&5
$as_echo "$as_me: Good, your configure finished." >&6;}
else
as_fn_error $? "Failed running $QT_QMAKE to generate the makefile" "$LINENO" 5
if test "x$qmake_ret" != "x0"; then :
as_fn_error $? "$QT_QMAKE failed to generate the makefile" "$LINENO" 5
fi

{ $as_echo "$as_me:${as_lineno-$LINENO}: Good, the configure finished." >&5
$as_echo "$as_me: Good, the configure finished." >&6;}
$as_echo
@@ -292,17 +292,14 @@ AC_OUTPUT(conf.pri)
AS_IF([test "x$enable_systemd" = "xyes"],
[AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])



AC_MSG_NOTICE([Running qmake to generate the makefile...])
CONFDIR="$( cd "$( dirname "$0" )" && pwd )"

$QT_QMAKE -r [$CONFDIR]/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE"

ret="$?"
TOPDIR="$(cd "$(dirname "$0")" && pwd)"
$QT_QMAKE -r "$TOPDIR/qbittorrent.pro" "QMAKE_LRELEASE=$QMAKE_LRELEASE"
qmake_ret="$?"

AS_ECHO()
AS_IF([test "x$ret" = "x0"],
[AC_MSG_NOTICE([Good, your configure finished.])],
[AC_MSG_ERROR([Failed running $QT_QMAKE to generate the makefile])])
AS_IF([test "x$qmake_ret" != "x0"],
[AC_MSG_ERROR([$QT_QMAKE failed to generate the makefile])])

AC_MSG_NOTICE([Good, the configure finished.])
AS_ECHO()
@@ -1,11 +1,9 @@
# Generated by the configure file
# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
# If not there will be a WARNING again.
# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
# The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
exists($$OUT_PWD/../conf.pri) {
include($$OUT_PWD/../conf.pri)
} else {
}
else {
include(conf.pri)
}

@@ -1,11 +1,9 @@
# Generated by the configure file
# Ignore any WARNING about 'conf.pri' missing during configure. The file should be found during make.
# If not there will be a WARNING again.
# The first path is used when the source is being build by packagers (pbuilder/sbuild/etc)
# The second path is used when you manually run the configure script in the root folder (eg when using qt creator)
exists($$OUT_PWD/../conf.pri) {
include($$OUT_PWD/../conf.pri)
} else {
}
else {
include(conf.pri)
}

@@ -18,7 +16,8 @@ QMAKE_CXXFLAGS += -Wall -Wextra -Wpedantic -Wformat-security
# Man page
nogui {
man.files = ../doc/qbittorrent-nox.1
} else {
}
else {
man.files = ../doc/qbittorrent.1
}

0 comments on commit 6bd5d0b

Please sign in to comment.