Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: >> ifdef SANE_TOOL_PATH >> SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH)) >> -BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|' >> +BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix $(SANE_TOOL_PATH_SQ)|' > > Aaargh! I totally managed to mess this split up. This line should *not* be > touched by this patch. > > Will fix locally, in preparation for the next iteration. Thanks for stopping me soon enough. I am in the middle of picking which ones should go 'next', as we can now start 'next' from the tip of 'master'---hat I pushed out some time ago has master and next with identical trees ;-)