diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-17 10:50:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-17 10:50:58 -0400 |
| commit | bb79373fe883b931e78730b7bef2de5e69414cac (patch) | |
| tree | 41711511b623f52ee1c17b16d6f18ed3a9d01a97 | |
| parent | bbc049a7561f8247db130a7b9115ce4ff392cf99 (diff) | |
| parent | b00a6211c5680ae79732d701732f7481cf353526 (diff) | |
| download | tor-bb79373fe883b931e78730b7bef2de5e69414cac.tar.gz tor-bb79373fe883b931e78730b7bef2de5e69414cac.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug7143 | 4 | ||||
| -rw-r--r-- | src/or/include.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug7143 b/changes/bug7143 new file mode 100644 index 0000000000..d26135ae65 --- /dev/null +++ b/changes/bug7143 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Add the old src/or/micro-revision.i filename to CLEANFILES. + On the off chance that somebody has one, it will go away as soon + as they run "make clean". Fix for bug 7143; bugfix on 0.2.4.1-alpha. diff --git a/src/or/include.am b/src/or/include.am index 241015488a..d2be1fb1ef 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -188,6 +188,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS) touch src/or/or_sha1.i; \ fi -CLEANFILES+= micro-revision.i +CLEANFILES+= micro-revision.i src/or/micro-revision.i FORCE: |