mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'js/skip-dashed-built-ins-from-config-mak'
Build fix. * js/skip-dashed-built-ins-from-config-mak: SKIP_DASHED_BUILT_INS: respect `config.mak`
This commit is contained in:
commit
6cd7f9dc29
28
Makefile
28
Makefile
|
@ -777,20 +777,6 @@ BUILT_INS += git-status$X
|
|||
BUILT_INS += git-switch$X
|
||||
BUILT_INS += git-whatchanged$X
|
||||
|
||||
# what 'all' will build and 'install' will install in gitexecdir,
|
||||
# excluding programs for built-in commands
|
||||
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
|
||||
ALL_COMMANDS_TO_INSTALL = $(ALL_PROGRAMS)
|
||||
ifeq (,$(SKIP_DASHED_BUILT_INS))
|
||||
ALL_COMMANDS_TO_INSTALL += $(BUILT_INS)
|
||||
else
|
||||
# git-upload-pack, git-receive-pack and git-upload-archive are special: they
|
||||
# are _expected_ to be present in the `bin/` directory in their dashed form.
|
||||
ALL_COMMANDS_TO_INSTALL += git-receive-pack$(X)
|
||||
ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X)
|
||||
ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X)
|
||||
endif
|
||||
|
||||
# what 'all' will build but not install in gitexecdir
|
||||
OTHER_PROGRAMS = git$X
|
||||
|
||||
|
@ -1226,6 +1212,20 @@ ifdef DEVELOPER
|
|||
include config.mak.dev
|
||||
endif
|
||||
|
||||
# what 'all' will build and 'install' will install in gitexecdir,
|
||||
# excluding programs for built-in commands
|
||||
ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
|
||||
ALL_COMMANDS_TO_INSTALL = $(ALL_PROGRAMS)
|
||||
ifeq (,$(SKIP_DASHED_BUILT_INS))
|
||||
ALL_COMMANDS_TO_INSTALL += $(BUILT_INS)
|
||||
else
|
||||
# git-upload-pack, git-receive-pack and git-upload-archive are special: they
|
||||
# are _expected_ to be present in the `bin/` directory in their dashed form.
|
||||
ALL_COMMANDS_TO_INSTALL += git-receive-pack$(X)
|
||||
ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X)
|
||||
ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X)
|
||||
endif
|
||||
|
||||
ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
|
||||
ALL_LDFLAGS = $(LDFLAGS)
|
||||
|
||||
|
|
Loading…
Reference in a new issue