diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:18:06 +0200 |
commit | 88d5749f6ae8d391963a12a6221f006de2947e50 (patch) | |
tree | f1de05b054b1ee8b272804a03b621a1dde1d8416 /bootstrap.sh | |
parent | 0225ef68f2876bebd14977882db313fd7f3f6d64 (diff) | |
parent | 3d6278bc31aa7053f1228b3d874ba36f50a8c2d5 (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Conflicts:
src/daemon/main.c
Diffstat (limited to 'bootstrap.sh')
-rwxr-xr-x | bootstrap.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index aa9755fa..79e0a7dc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -40,10 +40,16 @@ run_versioned() { set -ex +case $(uname) in + *Darwin*) + LIBTOOLIZE="glibtoolize" + ;; +esac + if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then echo "Activating pre-commit hook." - cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit - chmod -c +x .git/hooks/pre-commit + cp -pv .git/hooks/pre-commit.sample .git/hooks/pre-commit + chmod -v +x .git/hooks/pre-commit fi if [ -f .tarball-version ]; then |