Skip to content

Commit

Permalink
gmake.mk: renamed BUNDLED_GEMS as bundled-gems
Browse files Browse the repository at this point in the history
Hyphenated names are safe in GNU make.
  • Loading branch information
nobu committed Dec 2, 2020
1 parent 30ded41 commit 44f038b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions defs/gmake.mk
Expand Up @@ -248,9 +248,9 @@ HELP_EXTRA_TASKS = \

extract-gems: $(HAVE_BASERUBY:yes=update-gems)

BUNDLED_GEMS := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems)
bundled-gems := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems)

update-gems: | $(patsubst %,gems/%.gem,$(BUNDLED_GEMS))
update-gems: | $(patsubst %,gems/%.gem,$(bundled-gems))

test-bundler-precheck: | $(srcdir)/.bundle/cache

Expand All @@ -269,7 +269,7 @@ gems/%.gem:
-e 'File.unlink(*old) and' \
-e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})'

extract-gems: | $(patsubst %,.bundle/gems/%,$(BUNDLED_GEMS))
extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems))

.bundle/gems/%: gems/%.gem | .bundle/gems
$(ECHO) Extracting bundle gem $*...
Expand Down

0 comments on commit 44f038b

Please sign in to comment.