Browse code
Fix build when git is not installed and using BSD make.
Török Edvin authored on 2009/10/01 22:18:32Showing 2 changed files
| ... | ... |
@@ -346,8 +346,8 @@ version.h: version.h.tmp |
| 346 | 346 |
version.h.tmp: |
| 347 | 347 |
@test -f version.h || touch version.h;\ |
| 348 | 348 |
rm -f $@;\ |
| 349 |
- REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\ |
|
| 350 |
- if test $$? -ne 0; then\ |
|
| 349 |
+ REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\ |
|
| 350 |
+ if test "$$REVISION" = "exported"; then\ |
|
| 351 | 351 |
REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
| 352 | 352 |
if test "$$REVISION" = "rexported"; then\ |
| 353 | 353 |
REVISION="";\ |
| ... | ... |
@@ -2028,8 +2028,8 @@ version.h: version.h.tmp |
| 2028 | 2028 |
version.h.tmp: |
| 2029 | 2029 |
@test -f version.h || touch version.h;\ |
| 2030 | 2030 |
rm -f $@;\ |
| 2031 |
- REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null)";\ |
|
| 2032 |
- if test $$? -ne 0; then\ |
|
| 2031 |
+ REVISION="$$(LANG=C cd "$(top_srcdir)"; git describe --always 2>/dev/null || echo "exported")";\ |
|
| 2032 |
+ if test "$$REVISION" = "exported"; then\ |
|
| 2033 | 2033 |
REVISION="r$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)";\ |
| 2034 | 2034 |
if test "$$REVISION" = "rexported"; then\ |
| 2035 | 2035 |
REVISION="";\ |