mirror of
https://git.freebsd.org/ports.git
synced 2025-07-15 00:09:15 -04:00
28 lines
789 B
Text
28 lines
789 B
Text
--- ./configure.orig 2012-10-04 00:53:03.000000000 +0000
|
|
+++ ./configure 2012-10-06 22:30:21.900714143 +0000
|
|
@@ -100,7 +100,7 @@
|
|
# find a make command
|
|
if [ -z "$MAKE" ]; then
|
|
MAKE=
|
|
- for mk in gmake make; do
|
|
+ for mk in make gmake; do
|
|
if $WHICH $mk >/dev/null 2>&1; then
|
|
MAKE=`$WHICH $mk`
|
|
break
|
|
@@ -2186,7 +2186,7 @@
|
|
QDir::setCurrent(dir.path());
|
|
|
|
bool ok = false;
|
|
- int r = doCommand(qmake_path, QStringList() << "atest.pro");
|
|
+ int r = doCommand(qmake_path, QStringList() << qc_getenv("QMAKE_ARGS") << "atest.pro");
|
|
if(r == 0)
|
|
{
|
|
r = doCommand(maketool, QStringList());
|
|
@@ -2587,6 +2587,7 @@
|
|
args += "-spec";
|
|
args += qmakespec;
|
|
}
|
|
+ args += qc_getenv("QMAKE_ARGS");
|
|
args += proPath;
|
|
int ret = qc_runprogram(qmake_path, args, 0, true);
|
|
if(ret != 0)
|