From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jul 2018 19:20:32 +0000 (-0700)
Subject: Merge branch 'dj/runtime-prefix'
X-Git-Tag: v2.19.0-rc0~153
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36b37afda6487113a981b036431fa97aa3fe2234?ds=inline;hp=-c

Merge branch 'dj/runtime-prefix'

POSIX portability fix in Makefile to fix a glitch introduced a few
releases ago.

* dj/runtime-prefix:
Makefile: tweak sed invocation
---

36b37afda6487113a981b036431fa97aa3fe2234
diff --combined Makefile
index 0cb6590f24,50138e85eb..3b1effb4ca
--- a/Makefile
+++ b/Makefile
@@@ -464,26 -464,6 +464,26 @@@ all:
  # When using RUNTIME_PREFIX, define HAVE_WPGMPTR if your platform offers
  # the global variable _wpgmptr containing the absolute path of the current
  # executable (this is the case on Windows).
 +#
 +# Define DEVELOPER to enable more compiler warnings. Compiler version
 +# and family are auto detected, but could be overridden by defining
 +# COMPILER_FEATURES (see config.mak.dev)
 +#
 +# When DEVELOPER is set, DEVOPTS can be used to control compiler
 +# options.  This variable contains keywords separated by
 +# whitespace. The following keywords are are recognized:
 +#
 +#    no-error:
 +#
 +#        suppresses the -Werror that implicitly comes with
 +#        DEVELOPER=1. Useful for getting the full set of errors
 +#        without immediately dying, or for logging them.
 +#
 +#    extra-all:
 +#
 +#        The DEVELOPER mode enables -Wextra with a few exceptions. By
 +#        setting this flag the exceptions are removed, and all of
 +#        -Wextra is used.
  
  GIT-VERSION-FILE: FORCE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -492,6 -472,15 +492,6 @@@
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
  CFLAGS = -g -O2 -Wall
 -DEVELOPER_CFLAGS = -Werror \
 -	-Wdeclaration-after-statement \
 -	-Wno-format-zero-length \
 -	-Wold-style-definition \
 -	-Woverflow \
 -	-Wpointer-arith \
 -	-Wstrict-prototypes \
 -	-Wunused \
 -	-Wvla
  LDFLAGS =
  ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
@@@ -620,7 -609,6 +620,7 @@@ SCRIPT_LIB += git-mergetool--li
  SCRIPT_LIB += git-parse-remote
  SCRIPT_LIB += git-rebase--am
  SCRIPT_LIB += git-rebase--interactive
 +SCRIPT_LIB += git-rebase--preserve-merges
  SCRIPT_LIB += git-rebase--merge
  SCRIPT_LIB += git-sh-setup
  SCRIPT_LIB += git-sh-i18n
@@@ -690,6 -678,8 +690,6 @@@ PROGRAM_OBJS += http-backend.
  PROGRAM_OBJS += imap-send.o
  PROGRAM_OBJS += sh-i18n--envsubst.o
  PROGRAM_OBJS += shell.o
 -PROGRAM_OBJS += show-index.o
 -PROGRAM_OBJS += upload-pack.o
  PROGRAM_OBJS += remote-testsvn.o
  
  # Binary suffix, set to .exe for Windows builds
@@@ -738,7 -728,6 +738,7 @@@ TEST_PROGRAMS_NEED_X += test-dump-untra
  TEST_PROGRAMS_NEED_X += test-fake-ssh
  TEST_PROGRAMS_NEED_X += test-line-buffer
  TEST_PROGRAMS_NEED_X += test-parse-options
 +TEST_PROGRAMS_NEED_X += test-pkt-line
  TEST_PROGRAMS_NEED_X += test-svn-fe
  TEST_PROGRAMS_NEED_X += test-tool
  
@@@ -795,7 -784,7 +795,7 @@@ LIB_FILE = libgit.
  XDIFF_LIB = xdiff/lib.a
  VCSSVN_LIB = vcs-svn/lib.a
  
 -GENERATED_H += common-cmds.h
 +GENERATED_H += command-list.h
  
  LIB_H = $(shell $(FIND) . \
  	-name .git -prune -o \
@@@ -821,13 -810,11 +821,13 @@@ LIB_OBJS += branch.
  LIB_OBJS += bulk-checkin.o
  LIB_OBJS += bundle.o
  LIB_OBJS += cache-tree.o
 +LIB_OBJS += chdir-notify.o
  LIB_OBJS += checkout.o
  LIB_OBJS += color.o
  LIB_OBJS += column.o
  LIB_OBJS += combine-diff.o
  LIB_OBJS += commit.o
 +LIB_OBJS += commit-graph.o
  LIB_OBJS += compat/obstack.o
  LIB_OBJS += compat/terminal.o
  LIB_OBJS += config.o
@@@ -858,7 -845,7 +858,7 @@@ LIB_OBJS += ewah/bitmap.
  LIB_OBJS += ewah/ewah_bitmap.o
  LIB_OBJS += ewah/ewah_io.o
  LIB_OBJS += ewah/ewah_rlw.o
 -LIB_OBJS += exec_cmd.o
 +LIB_OBJS += exec-cmd.o
  LIB_OBJS += fetch-object.o
  LIB_OBJS += fetch-pack.o
  LIB_OBJS += fsck.o
@@@ -881,11 -868,9 +881,11 @@@ LIB_OBJS += list-objects-filter-options
  LIB_OBJS += ll-merge.o
  LIB_OBJS += lockfile.o
  LIB_OBJS += log-tree.o
 +LIB_OBJS += ls-refs.o
  LIB_OBJS += mailinfo.o
  LIB_OBJS += mailmap.o
  LIB_OBJS += match-trees.o
 +LIB_OBJS += mem-pool.o
  LIB_OBJS += merge.o
  LIB_OBJS += merge-blobs.o
  LIB_OBJS += merge-recursive.o
@@@ -928,10 -913,9 +928,10 @@@ LIB_OBJS += refs/files-backend.
  LIB_OBJS += refs/iterator.o
  LIB_OBJS += refs/packed-backend.o
  LIB_OBJS += refs/ref-cache.o
 +LIB_OBJS += refspec.o
  LIB_OBJS += ref-filter.o
  LIB_OBJS += remote.o
 -LIB_OBJS += replace_object.o
 +LIB_OBJS += replace-object.o
  LIB_OBJS += repository.o
  LIB_OBJS += rerere.o
  LIB_OBJS += resolve-undo.o
@@@ -939,13 -923,12 +939,13 @@@ LIB_OBJS += revision.
  LIB_OBJS += run-command.o
  LIB_OBJS += send-pack.o
  LIB_OBJS += sequencer.o
 +LIB_OBJS += serve.o
  LIB_OBJS += server-info.o
  LIB_OBJS += setup.o
  LIB_OBJS += sha1-array.o
  LIB_OBJS += sha1-lookup.o
 -LIB_OBJS += sha1_file.o
 -LIB_OBJS += sha1_name.o
 +LIB_OBJS += sha1-file.o
 +LIB_OBJS += sha1-name.o
  LIB_OBJS += shallow.o
  LIB_OBJS += sideband.o
  LIB_OBJS += sigchain.o
@@@ -968,7 -951,6 +968,7 @@@ LIB_OBJS += tree-diff.
  LIB_OBJS += tree.o
  LIB_OBJS += tree-walk.o
  LIB_OBJS += unpack-trees.o
 +LIB_OBJS += upload-pack.o
  LIB_OBJS += url.o
  LIB_OBJS += urlmatch.o
  LIB_OBJS += usage.o
@@@ -981,7 -963,7 +981,7 @@@ LIB_OBJS += walker.
  LIB_OBJS += wildmatch.o
  LIB_OBJS += worktree.o
  LIB_OBJS += wrapper.o
 -LIB_OBJS += write_or_die.o
 +LIB_OBJS += write-or-die.o
  LIB_OBJS += ws.o
  LIB_OBJS += wt-status.o
  LIB_OBJS += xdiff-interface.o
@@@ -1008,7 -990,6 +1008,7 @@@ BUILTIN_OBJS += builtin/clone.
  BUILTIN_OBJS += builtin/column.o
  BUILTIN_OBJS += builtin/commit-tree.o
  BUILTIN_OBJS += builtin/commit.o
 +BUILTIN_OBJS += builtin/commit-graph.o
  BUILTIN_OBJS += builtin/config.o
  BUILTIN_OBJS += builtin/count-objects.o
  BUILTIN_OBJS += builtin/credential.o
@@@ -1074,10 -1055,8 +1074,10 @@@ BUILTIN_OBJS += builtin/rev-parse.
  BUILTIN_OBJS += builtin/revert.o
  BUILTIN_OBJS += builtin/rm.o
  BUILTIN_OBJS += builtin/send-pack.o
 +BUILTIN_OBJS += builtin/serve.o
  BUILTIN_OBJS += builtin/shortlog.o
  BUILTIN_OBJS += builtin/show-branch.o
 +BUILTIN_OBJS += builtin/show-index.o
  BUILTIN_OBJS += builtin/show-ref.o
  BUILTIN_OBJS += builtin/stripspace.o
  BUILTIN_OBJS += builtin/submodule--helper.o
@@@ -1089,7 -1068,6 +1089,7 @@@ BUILTIN_OBJS += builtin/update-index.
  BUILTIN_OBJS += builtin/update-ref.o
  BUILTIN_OBJS += builtin/update-server-info.o
  BUILTIN_OBJS += builtin/upload-archive.o
 +BUILTIN_OBJS += builtin/upload-pack.o
  BUILTIN_OBJS += builtin/var.o
  BUILTIN_OBJS += builtin/verify-commit.o
  BUILTIN_OBJS += builtin/verify-pack.o
@@@ -1111,7 -1089,7 +1111,7 @@@ include config.mak.unam
  -include config.mak
  
  ifdef DEVELOPER
 -CFLAGS += $(DEVELOPER_CFLAGS)
 +include config.mak.dev
  endif
  
  comma := ,
@@@ -1352,19 -1330,17 +1352,19 @@@ ifdef APPLE_COMMON_CRYPT
  	LIB_4_CRYPTO += -framework Security -framework CoreFoundation
  endif
  endif
 -ifdef NEEDS_LIBICONV
 -	ifdef ICONVDIR
 -		BASIC_CFLAGS += -I$(ICONVDIR)/include
 -		ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib)
 -	else
 -		ICONV_LINK =
 -	endif
 -	ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
 -		ICONV_LINK += -lintl
 +ifndef NO_ICONV
 +	ifdef NEEDS_LIBICONV
 +		ifdef ICONVDIR
 +			BASIC_CFLAGS += -I$(ICONVDIR)/include
 +			ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib)
 +		else
 +			ICONV_LINK =
 +		endif
 +		ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
 +			ICONV_LINK += -lintl
 +		endif
 +		EXTLIBS += $(ICONV_LINK) -liconv
  	endif
 -	EXTLIBS += $(ICONV_LINK) -liconv
  endif
  ifdef NEEDS_LIBGEN
  	EXTLIBS += -lgen
@@@ -2009,9 -1985,9 +2009,9 @@@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
  		$(filter %.o,$^) $(LIBS)
  
 -help.sp help.s help.o: common-cmds.h
 +help.sp help.s help.o: command-list.h
  
 -builtin/help.sp builtin/help.s builtin/help.o: common-cmds.h GIT-PREFIX
 +builtin/help.sp builtin/help.s builtin/help.o: command-list.h GIT-PREFIX
  builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
  	'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
  	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
@@@ -2030,9 -2006,9 +2030,9 @@@ $(BUILT_INS): git$
  	ln -s $< $@ 2>/dev/null || \
  	cp $< $@
  
 -common-cmds.h: generate-cmdlist.sh command-list.txt
 +command-list.h: generate-cmdlist.sh command-list.txt
  
 -common-cmds.h: $(wildcard Documentation/git-*.txt)
 +command-list.h: $(wildcard Documentation/git*.txt)
  	$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
  
  SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
@@@ -2110,7 -2086,7 +2110,7 @@@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL
  	$(QUIET_GEN)$(RM) $@ $@+ && \
  	sed -e '1{' \
  	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
- 	    -e '	rGIT-PERL-HEADER' \
+ 	    -e '	r GIT-PERL-HEADER' \
  	    -e '	G' \
  	    -e '}' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
@@@ -2139,10 -2115,6 +2139,10 @@@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE
  	    $< >$@+ && \
  	mv $@+ $@
  
 +.PHONY: perllibdir
 +perllibdir:
 +	@echo '$(perllibdir_SQ)'
 +
  .PHONY: gitweb
  gitweb:
  	$(QUIET_SUBDIR0)gitweb $(QUIET_SUBDIR1) all
@@@ -2276,19 -2248,19 +2276,19 @@@ els
  # Dependencies on header files, for platforms that do not support
  # the gcc -MMD option.
  #
 -# Dependencies on automatically generated headers such as common-cmds.h
 +# Dependencies on automatically generated headers such as command-list.h
  # should _not_ be included here, since they are necessary even when
  # building an object for the first time.
  
  $(OBJECTS): $(LIB_H)
  endif
  
 -exec_cmd.sp exec_cmd.s exec_cmd.o: GIT-PREFIX
 -exec_cmd.sp exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
 +exec-cmd.sp exec-cmd.s exec-cmd.o: GIT-PREFIX
 +exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \
  	'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
  	'-DGIT_LOCALE_PATH="$(localedir_relative_SQ)"' \
  	'-DBINDIR="$(bindir_relative_SQ)"' \
 -	'-DPREFIX="$(prefix_SQ)"'
 +	'-DFALLBACK_RUNTIME_PREFIX="$(prefix_SQ)"'
  
  builtin/init-db.sp builtin/init-db.s builtin/init-db.o: GIT-PREFIX
  builtin/init-db.sp builtin/init-db.s builtin/init-db.o: EXTRA_CPPFLAGS = \
@@@ -2398,7 -2370,6 +2398,7 @@@ LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(G
  LOCALIZED_SH = $(SCRIPT_SH)
  LOCALIZED_SH += git-parse-remote.sh
  LOCALIZED_SH += git-rebase--interactive.sh
 +LOCALIZED_SH += git-rebase--preserve-merges.sh
  LOCALIZED_SH += git-sh-setup.sh
  LOCALIZED_PERL = $(SCRIPT_PERL)
  
@@@ -2657,7 -2628,7 +2657,7 @@@ sparse: $(SP_OBJ
  style:
  	git clang-format --style file --diff --extensions c,h
  
 -check: common-cmds.h
 +check: command-list.h
  	@if sparse; \
  	then \
  		echo >&2 "Use 'make sparse' instead"; \
@@@ -2905,7 -2876,7 +2905,7 @@@ clean: profile-clean coverage-clea
  	$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
  	$(RM) -r bin-wrappers $(dep_dirs)
  	$(RM) -r po/build/
 -	$(RM) *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*
 +	$(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope*
  	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
  	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
  	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz