make/Bundles.gmk
changeset 47334 09d386ddaa42
parent 47314 743814386712
child 47440 963f70aa578d
equal deleted inserted replaced
47333:0c2e5ef6a1c6 47334:09d386ddaa42
    68   endif
    68   endif
    69 
    69 
    70   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
    70   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
    71 
    71 
    72   $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
    72   $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
       
    73         # If any of the files contain a space in the file name, CacheFind
       
    74         # will have replaced it with ?. Tar does not accept that so need to
       
    75         # switch it back.
    73 	$$(foreach d, $$($1_BASE_DIRS), \
    76 	$$(foreach d, $$($1_BASE_DIRS), \
    74 	  $$(eval $$(call ListPathsSafely, \
    77 	  $$(eval $$(call ListPathsSafely, \
    75 	      $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \
    78 	      $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \
       
    79 	  $$(CAT) $$($1_$$d_LIST_FILE) | $$(TR) '?' ' ' > $$($1_$$d_LIST_FILE).tmp \
       
    80 	      && $(MV) $$($1_$$d_LIST_FILE).tmp $$($1_$$d_LIST_FILE) $$(NEWLINE) \
    76 	)
    81 	)
    77 	$$(call MakeDir, $$(@D))
    82 	$$(call MakeDir, $$(@D))
    78         ifneq ($$($1_SPECIAL_INCLUDES), )
    83         ifneq ($$($1_SPECIAL_INCLUDES), )
    79 	  $$(foreach i, $$($1_SPECIAL_INCLUDES), \
    84 	  $$(foreach i, $$($1_SPECIAL_INCLUDES), \
    80 	    $$(foreach d, $$($1_BASE_DIRS), \
    85 	    $$(foreach d, $$($1_BASE_DIRS), \