mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Handle build-trees better.
Properly create git revision and source file sha1sums include files when building tor not in its source tree but in a dedicated build tree.
This commit is contained in:
parent
916aa8022d
commit
86be8fcf0a
@ -56,9 +56,9 @@ noinst_HEADERS = \
|
||||
|
||||
common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
|
||||
if test "@SHA1SUM@" != none; then \
|
||||
@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 \
|
||||
@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; \
|
||||
|
@ -126,8 +126,9 @@ tor_main.o: micro-revision.i
|
||||
|
||||
micro-revision.i: FORCE
|
||||
@rm -f micro-revision.tmp; \
|
||||
if test -d ../../.git && test -x "`which git 2>&1;true`"; then \
|
||||
HASH="`git rev-parse --short=16 HEAD`"; \
|
||||
if test -d "$(top_srcdir)/.git" && \
|
||||
test -x "`which git 2>&1;true`"; then \
|
||||
HASH="`cd "$(top_srcdir)" && git rev-parse --short=16 HEAD`"; \
|
||||
echo \"$$HASH\" > micro-revision.tmp; \
|
||||
fi; \
|
||||
if test ! -f micro-revision.tmp ; then \
|
||||
@ -141,10 +142,10 @@ micro-revision.i: FORCE
|
||||
|
||||
or_sha1.i: $(tor_SOURCES) $(libtor_a_SOURCES)
|
||||
if test "@SHA1SUM@" != none; then \
|
||||
@SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES) | \
|
||||
(cd "$(srcdir)" && @SHA1SUM@ $(tor_SOURCES) $(libtor_a_SOURCES)) | \
|
||||
@SED@ -n 's/^\(.*\)$$/"\1\\n"/p' > or_sha1.i; \
|
||||
elif test "@OPENSSL@" != none; then \
|
||||
@OPENSSL@ sha1 $(tor_SOURCES) $(libtor_a_SOURCES) | \
|
||||
(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; \
|
||||
|
Loading…
Reference in New Issue
Block a user