summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2012-01-23 15:08:46 +0100
committerunknown <knielsen@knielsen-hq.org>2012-01-23 15:08:46 +0100
commitaa2a2f83e3eac2fe95f4eb6bf9ff948a1c580242 (patch)
tree7325117cfe24ace9acb738b17812cbd7cc612430 /debian
parentcfd4fcb0bc3d469dfca74dae30d17250d65fdd91 (diff)
downloadmariadb-git-aa2a2f83e3eac2fe95f4eb6bf9ff948a1c580242.tar.gz
Buildbot VMs have cmake in /usr/local/, so we need to include that in the path.
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/dist/Debian/rules2
-rwxr-xr-xdebian/dist/Ubuntu/rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 58d0c268ca3..11347164ea0 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd)
endif
( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
- sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \
CC=$${MYSQL_BUILD_CC:-gcc} \
CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
CXX=$${MYSQL_BUILD_CXX:-g++} \
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 0bb8837993e..564dad01ac0 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd)
endif
( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
- sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
+ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \
CC=$${MYSQL_BUILD_CC:-gcc} \
CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
CXX=$${MYSQL_BUILD_CXX:-g++} \