# HG changeset patch
# User asaha
# Date 1411151355 25200
# Node ID 6cb87661323015fdbbc07d0abb83b1e9f5bf04af
# Parent  29b67e73358f1cfefec3e4c903e14e15968285d1# Parent  1983776122a29b68ed17faf330391d5938b0f091
Merge

diff -r 29b67e73358f -r 6cb876613230 .hgtags
diff -r 29b67e73358f -r 6cb876613230 common/autoconf/generated-configure.sh
diff -r 29b67e73358f -r 6cb876613230 make/Jprt.gmk
--- a/make/Jprt.gmk	Tue Sep 16 09:01:40 2014 -0700
+++ b/make/Jprt.gmk	Fri Sep 19 11:29:15 2014 -0700
@@ -25,6 +25,9 @@
 
 # This file is contains targets utilities needed by JPRT.
 
+          ifdef ALT_BSDIFF_DIR
+	    @$(ECHO) " --with-bsdiff-dir=$(call UnixPath,$(ALT_BSDIFF_DIR)) " >> $@.tmp
+          endif
 ifndef JPRT_ARCHIVE_BUNDLE
   JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
 endif
diff -r 29b67e73358f -r 6cb876613230 make/jprt.properties