Merge

Fri, 19 Sep 2014 11:29:15 -0700

author
asaha
date
Fri, 19 Sep 2014 11:29:15 -0700
changeset 1174
6cb876613230
parent 1173
29b67e73358f
parent 1131
1983776122a2
child 1176
dbbca883b08f

Merge

.hgtags file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
make/Jprt.gmk file | annotate | diff | comparison | revisions
make/jprt.properties file | annotate | diff | comparison | revisions
     1.1 --- a/make/Jprt.gmk	Tue Sep 16 09:01:40 2014 -0700
     1.2 +++ b/make/Jprt.gmk	Fri Sep 19 11:29:15 2014 -0700
     1.3 @@ -25,6 +25,9 @@
     1.4  
     1.5  # This file is contains targets utilities needed by JPRT.
     1.6  
     1.7 +          ifdef ALT_BSDIFF_DIR
     1.8 +	    @$(ECHO) " --with-bsdiff-dir=$(call UnixPath,$(ALT_BSDIFF_DIR)) " >> $@.tmp
     1.9 +          endif
    1.10  ifndef JPRT_ARCHIVE_BUNDLE
    1.11    JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
    1.12  endif

mercurial