Changeset 538

Show
Ignore:
Timestamp:
02/27/09 17:33:28 (9 months ago)
Author:
jdecq
Message:

=accomodate new location of mar tool

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r532 r538  
    6565# Location of Mozilla tree for the MAR tools 
    6666MOZILLA := /c/mozilla 
     67MARTOOLDIR := /c/mozilla 
    6768 
    6869# Location for application bundle staging 
    …… 
    101102# Location of Mozilla tree for the MAR tools 
    102103MOZILLA := ~/UPLOADR/mozilla 
     104MARTOOLDIR := ~/UPLOADR/mozilla/obj-xulrunner/ppc 
    103105 
    104106# Location for build staging 
    …… 
    421423endif 
    422424        @rm -f $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT).complete.mar 
    423         @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
     425        @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MARTOOLDIR)/modules/libmar/tool" \ 
    424426                $(MOZILLA)/tools/update-packaging/make_full_update.sh \ 
    425427                $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT)-$(PLATFORM).complete.mar \ 
    426428                $(BUILD)/new &> /dev/null 
    427429#       @rm -f $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar 
    428 #       @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
     430#       @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MARTOOLDIR)/modules/libmar/tool" \ 
    429431#               $(MOZILLA)/tools/update-packaging/make_incremental_update.sh \ 
    430432#               $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar \