Skip to content

Commit

Permalink
Don't use $(wildcard) during 'make install'.
Browse files Browse the repository at this point in the history
It seems the $(wildcard) is evaluated once at make's startup, so any changes
made *during* build don't get noticed.

That means 'make install' would fail if you ran it without first running
'make all', because $(wildcard cmd/bup-*) wouldn't match anything at startup
time; the files we were copying only got created during the build.

Problem reported by David Roda.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>
  • Loading branch information
apenwarr committed Sep 4, 2010
1 parent c2bc8a2 commit b045a23
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Makefile
Expand Up @@ -37,27 +37,27 @@ install: all
$(LIBDIR)/web $(LIBDIR)/web
[ ! -e Documentation/.docs-available ] || \ [ ! -e Documentation/.docs-available ] || \
$(INSTALL) -m 0644 \ $(INSTALL) -m 0644 \
$(wildcard Documentation/*.1) \ Documentation/*.1 \
$(MANDIR)/man1 $(MANDIR)/man1
[ ! -e Documentation/.docs-available ] || \ [ ! -e Documentation/.docs-available ] || \
$(INSTALL) -m 0644 \ $(INSTALL) -m 0644 \
$(wildcard Documentation/*.html) \ Documentation/*.html \
$(DOCDIR) $(DOCDIR)
$(INSTALL) -m 0755 bup $(BINDIR) $(INSTALL) -m 0755 bup $(BINDIR)
$(INSTALL) -m 0755 \ $(INSTALL) -m 0755 \
$(wildcard cmd/bup-*) \ cmd/bup-* \
$(LIBDIR)/cmd $(LIBDIR)/cmd
$(INSTALL) -m 0644 \ $(INSTALL) -m 0644 \
$(wildcard lib/bup/*.py) \ lib/bup/*.py \
$(LIBDIR)/bup $(LIBDIR)/bup
$(INSTALL) -m 0755 \ $(INSTALL) -m 0755 \
$(wildcard lib/bup/*$(SOEXT)) \ lib/bup/*$(SOEXT) \
$(LIBDIR)/bup $(LIBDIR)/bup
$(INSTALL) -m 0644 \ $(INSTALL) -m 0644 \
$(wildcard lib/tornado/*.py) \ lib/tornado/*.py \
$(LIBDIR)/tornado $(LIBDIR)/tornado
$(INSTALL) -m 0644 \ $(INSTALL) -m 0644 \
$(wildcard lib/web/*) \ lib/web/* \
$(LIBDIR)/web $(LIBDIR)/web
%/all: %/all:
$(MAKE) -C $* all $(MAKE) -C $* all
Expand Down

0 comments on commit b045a23

Please sign in to comment.