diff options
| author | 2010-09-19 15:55:31 +0200 | |
|---|---|---|
| committer | 2010-09-19 15:55:31 +0200 | |
| commit | bbaa8380a2af9130075f907033283761bfe56b5c (patch) | |
| tree | 4474448b9b074e4e82e42c09fae5de6c887f1abe /Modules/describe.sh | |
| parent | f8a406e4f4b2627baf37cb2c20e327bc5e62ca87 (diff) | |
| download | usbmuxd-bbaa8380a2af9130075f907033283761bfe56b5c.tar.gz usbmuxd-bbaa8380a2af9130075f907033283761bfe56b5c.tar.bz2 | |
Fixes for building libusbmuxd on OS X
Adds include_directories(${OPT_INCLUDES}) for when libplist isn't in
the default include directories.
Uses /bin/echo instead of sh's echo as "echo -n" does not work on
OS X's sh.
Diffstat (limited to 'Modules/describe.sh')
| -rwxr-xr-x | Modules/describe.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/describe.sh b/Modules/describe.sh index 91730b8..6425ed5 100755 --- a/Modules/describe.sh +++ b/Modules/describe.sh | |||
| @@ -2,15 +2,15 @@ | |||
| 2 | 2 | ||
| 3 | # Check for git and a git repo. | 3 | # Check for git and a git repo. |
| 4 | if head=`git rev-parse --verify HEAD 2>/dev/null`; then | 4 | if head=`git rev-parse --verify HEAD 2>/dev/null`; then |
| 5 | echo -n `git describe` | 5 | /bin/echo -n `git describe` |
| 6 | 6 | ||
| 7 | # Are there uncommitted changes? | 7 | # Are there uncommitted changes? |
| 8 | git update-index --refresh --unmerged > /dev/null | 8 | git update-index --refresh --unmerged > /dev/null |
| 9 | git diff-index --quiet HEAD || echo -n -dirty | 9 | git diff-index --quiet HEAD || /bin/echo -n -dirty |
| 10 | else | 10 | else |
| 11 | # Check for version tag | 11 | # Check for version tag |
| 12 | if [ -e version.tag ]; then | 12 | if [ -e version.tag ]; then |
| 13 | echo -n `cat version.tag` | 13 | /bin/echo -n `cat version.tag` |
| 14 | fi | 14 | fi |
| 15 | fi | 15 | fi |
| 16 | 16 | ||
