diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:34 (GMT) |
| commit | 71c848bb28a2fcef918178f286f7e43d9804588d (patch) | |
| tree | 3dce8d79ffa6e3cd81d9076afb59d9b3a878c93c /Makefile | |
| parent | a56fb3dcc09239795823de40ffcbbf5713114eb5 (diff) | |
| parent | 4d5b4c247597a5891beb84d933b8eecb77c76186 (diff) | |
| download | git-71c848bb28a2fcef918178f286f7e43d9804588d.zip git-71c848bb28a2fcef918178f286f7e43d9804588d.tar.gz git-71c848bb28a2fcef918178f286f7e43d9804588d.tar.bz2 | |
Merge branch 'js/runtime-prefix'
* js/runtime-prefix:
Avoid multiple PREFIX definitions
git_setup_gettext: plug memory leak
gettext: avoid initialization if the locale dir is not present
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2284,7 +2284,7 @@ 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 = \ |