Merge remote-tracking branch 'upstream/master'

2012-09-08 11:04:24 +08:00 · 2012-09-08 11:04:24 +08:00 · f6cdb43d72
commit f6cdb43d72
parent d0d61b491f 9fe9297dbc
1 changed files with 2 additions and 2 deletions
--- a/test/mozcentral/Makefile.in
+++ b/test/mozcentral/Makefile.in
@ -2,11 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.

-DEPTH     = ../../../..
+DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-relativesrcdir  = browser/extensions/pdfjs/test
+relativesrcdir  = @relativesrcdir@

 include $(DEPTH)/config/autoconf.mk