Skip to content

Commit

Permalink
Fix build on FreeBSD (#209)
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Larsen <[email protected]>
  • Loading branch information
stromnet authored and manolama committed Nov 9, 2014
1 parent 378542c commit 08ab3e4
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion build-aux/create-src-dir-overlay.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Creates directory structure overlay on top of original source directories so
# that the overlay matches Java package hierarchy.
#!/bin/bash
#!/usr/bin/env bash

if [ ! -d src-main ]; then
mkdir src-main
Expand Down
2 changes: 1 addition & 1 deletion build-aux/fetchdep.sh.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
# Getting this value out of Autoconf is not a good idea, because it might be
# set to a relative path to install-sh. We don't install `install-sh' during
Expand Down
2 changes: 1 addition & 1 deletion build-aux/gen_build_data.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
# Generates BuildData.java
# Usage: gen_build_data.sh path/to/BuildData.java my.package.name
# Author: Benoit Sigoure ([email protected])
Expand Down
6 changes: 4 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/bash
#!/usr/bin/env bash
set -xe
test -f configure || ./bootstrap
test -d build || mkdir build
cd build
test -f Makefile || ../configure "$@"
exec make "$@"
MAKE=make
[ `uname -s` = "FreeBSD" ] && MAKE=gmake
exec ${MAKE} "$@"
2 changes: 1 addition & 1 deletion tools/clean_cache.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

CACHE_DIR=/tmp/tsd

Expand Down
2 changes: 1 addition & 1 deletion tsdb.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -e
me=`basename "$0"`
Expand Down

0 comments on commit 08ab3e4

Please sign in to comment.