diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-02-12 23:27:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-02-12 23:27:31 -0500 |
| commit | 4aa0aa0300ca9ff4e65ff32eae0db7db4fe24c3d (patch) | |
| tree | f1e81f357dc68a1b220525130bb87050c9371ce6 | |
| parent | 61452299d1067298a2865deb6398b1fb269b2a81 (diff) | |
| parent | 8ce6722d7654e6b19fb3d3741b7329b95cb72bac (diff) | |
| download | tor-4aa0aa0300ca9ff4e65ff32eae0db7db4fe24c3d.tar.gz tor-4aa0aa0300ca9ff4e65ff32eae0db7db4fe24c3d.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/Makefile.am
src/or/Makefile.am
| -rw-r--r-- | changes/bug5065 | 5 | ||||
| -rw-r--r-- | src/common/Makefile.am | 4 | ||||
| -rw-r--r-- | src/or/Makefile.am | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/changes/bug5065 b/changes/bug5065 new file mode 100644 index 0000000000..d195313623 --- /dev/null +++ b/changes/bug5065 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix build if path to sed, openssl or sha1sum contains spaces. + This is pretty common on Windows. Fixes bug 5065; bugfix on + 0.2.2.1-alpha. + diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 04c411556a..5e7684259a 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -55,9 +55,9 @@ noinst_HEADERS = \ common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ - (cd "$(srcdir)" && @SHA1SUM@ $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > common_sha1.i; \ + (cd "$(srcdir)" && "@SHA1SUM@" $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > common_sha1.i; \ elif test "@OPENSSL@" != none; then \ - (cd "$(srcdir)" && @OPENSSL@ sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > common_sha1.i; \ + (cd "$(srcdir)" && "@OPENSSL@" sha1 $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)) | "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > common_sha1.i; \ else \ rm common_sha1.i; \ touch common_sha1.i; \ diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 57f5dd65e4..3cc789a1be 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -142,11 +142,11 @@ micro-revision.i: FORCE or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES) if test "@SHA1SUM@" != none; then \ - (cd "$(srcdir)" && @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES)) | \ - @SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \ + (cd "$(srcdir)" && "@SHA1SUM@" $(tor_SOURCES) $(libtor_a_SOURCES)) | \ + "@SED@" -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \ elif test "@OPENSSL@" != none; then \ - (cd "$(srcdir)" && @OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \ - @SED@ -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \ + (cd "$(srcdir)" && "@OPENSSL@" sha1 $(tor_SOURCES) $(libtor_a_SOURCES)) | \ + "@SED@" -n 's/SHA1(\(.*\))= \(.*\)/"\2 \1\\n"/p' > or_sha1.i; \ else \ rm or_sha1.i; \ touch or_sha1.i; \ |