Skip to content

Commit d6ff7dc

Browse files
committed
install: no dependency to version.inc in init/Makefile
The Makefile script in the init directory does not depend on the definitions stored in the version.inc file. So remove inclusion and requirement definition to this version.inc file in init/Makefile.
1 parent eb8708e commit d6ff7dc

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ifneq ($(builddoc),n)
100100
all: pkgdoc
101101
endif
102102

103-
initdir: version.inc
103+
initdir:
104104
$(MAKE) --no-print-directory -C init all
105105

106106
pkgdoc: version.inc

init/Makefile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ ifeq ($(setmodulespath),y)
5454
all: modulespath
5555
endif
5656

57-
../version.inc:
58-
$(MAKE) --no-print-directory -C .. version.inc
59-
60-
# source version definitions shared across the Makefiles of this project
61-
ifeq ($(findstring clean,$(MAKECMDGOALS)),)
62-
-include ../version.inc
63-
endif
64-
6557
# define init configs location
6658
ifeq ($(initconfin),etcdir)
6759
modulespath := $(etcdir)/modulespath
@@ -241,10 +233,10 @@ tcsh: csh.in
241233
profile.sh: profile.sh.in
242234
$(translate-in-script)
243235

244-
$(EXAMPLE_MODFILES_SRCDIR)/modules: $(EXAMPLE_MODFILES_SRCDIR)/modules.in ../version.inc
236+
$(EXAMPLE_MODFILES_SRCDIR)/modules: $(EXAMPLE_MODFILES_SRCDIR)/modules.in
245237
$(translate-in-script)
246238

247-
$(EXAMPLE_MODFILES_SRCDIR)/version: $(EXAMPLE_MODFILES_SRCDIR)/version.in ../version.inc
239+
$(EXAMPLE_MODFILES_SRCDIR)/version: $(EXAMPLE_MODFILES_SRCDIR)/version.in
248240
$(translate-in-script)
249241

250242
dist-win:
@@ -360,7 +352,7 @@ ifeq ($(VERBOSE),1)
360352
V = 1
361353
endif
362354
# let verbose by default the install/clean/test and other specific non-build targets
363-
$(V).SILENT: ../version.inc sh ksh bash zsh csh tcsh fish perl.pm python.py ruby.rb \
364-
lisp tcl cmake r.R bash_completion tcsh_completion zsh-functions/_module \
365-
profile.sh profile.csh modulespath initrc $(EXAMPLE_MODFILES_SRCDIR)/modules \
355+
$(V).SILENT: sh ksh bash zsh csh tcsh fish perl.pm python.py ruby.rb lisp tcl \
356+
cmake r.R bash_completion tcsh_completion zsh-functions/_module profile.sh \
357+
profile.csh modulespath initrc $(EXAMPLE_MODFILES_SRCDIR)/modules \
366358
$(EXAMPLE_MODFILES_SRCDIR)/version

0 commit comments

Comments
 (0)