SKIP_DASHED_BUILT_INS: respect `config.mak`
When `SKIP_DASHED_BUILT_INS` is specified in `config.mak`, the dashed form of the built-ins was still generated. By moving the `SKIP_DASHED_BUILT_INS` handling after `config.mak` was read, this can be avoided. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 21, 2021 at 13:09 UTC
4a5ec7d166369bb537d31e2920651d40538511b3
1 file changed
+14
-14
Makefile
+14
-14
@@ -775,20 +775,6 @@ BUILT_INS += git-status$X
775
BUILT_INS += git-switch$X
776
BUILT_INS += git-whatchanged$X
777
778
-# what 'all' will build and 'install' will install in gitexecdir,
779
-# excluding programs for built-in commands
780
-ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
781
-ALL_COMMANDS_TO_INSTALL = $(ALL_PROGRAMS)
782
-ifeq (,$(SKIP_DASHED_BUILT_INS))
783
-ALL_COMMANDS_TO_INSTALL += $(BUILT_INS)
784
-else
785
-# git-upload-pack, git-receive-pack and git-upload-archive are special: they
786
-# are _expected_ to be present in the `bin/` directory in their dashed form.
787
-ALL_COMMANDS_TO_INSTALL += git-receive-pack$(X)
788
-ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X)
789
-ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X)
790
-endif
791
-
778
# what 'all' will build but not install in gitexecdir
779
OTHER_PROGRAMS = git$X
780
@@ -1220,6 +1206,20 @@ ifdef DEVELOPER
1206
include config.mak.dev
1207
endif
1208
1209
+# what 'all' will build and 'install' will install in gitexecdir,
1210
+# excluding programs for built-in commands
1211
+ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
1212
+ALL_COMMANDS_TO_INSTALL = $(ALL_PROGRAMS)
1213
+ifeq (,$(SKIP_DASHED_BUILT_INS))
1214
+ALL_COMMANDS_TO_INSTALL += $(BUILT_INS)
1215
+else
1216
+# git-upload-pack, git-receive-pack and git-upload-archive are special: they
1217
+# are _expected_ to be present in the `bin/` directory in their dashed form.
1218
+ALL_COMMANDS_TO_INSTALL += git-receive-pack$(X)
1219
+ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X)
1220
+ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X)
1221
+endif
1222
+
1223
ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
1224
ALL_LDFLAGS = $(LDFLAGS)
1225