Permalink
Browse files

Don't use $(wildcard) during 'make install'.

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...
1 parent c2bc8a2 commit b045a23f7d4659ac66afe36f6f0e426b42abb368 @apenwarr committed Sep 4, 2010
Showing with 7 additions and 7 deletions.
  1. +7 −7 Makefile
View
14 Makefile
@@ -37,27 +37,27 @@ install: all
$(LIBDIR)/web
[ ! -e Documentation/.docs-available ] || \
$(INSTALL) -m 0644 \
- $(wildcard Documentation/*.1) \
+ Documentation/*.1 \
$(MANDIR)/man1
[ ! -e Documentation/.docs-available ] || \
$(INSTALL) -m 0644 \
- $(wildcard Documentation/*.html) \
+ Documentation/*.html \
$(DOCDIR)
$(INSTALL) -m 0755 bup $(BINDIR)
$(INSTALL) -m 0755 \
- $(wildcard cmd/bup-*) \
+ cmd/bup-* \
$(LIBDIR)/cmd
$(INSTALL) -m 0644 \
- $(wildcard lib/bup/*.py) \
+ lib/bup/*.py \
$(LIBDIR)/bup
$(INSTALL) -m 0755 \
- $(wildcard lib/bup/*$(SOEXT)) \
+ lib/bup/*$(SOEXT) \
$(LIBDIR)/bup
$(INSTALL) -m 0644 \
- $(wildcard lib/tornado/*.py) \
+ lib/tornado/*.py \
$(LIBDIR)/tornado
$(INSTALL) -m 0644 \
- $(wildcard lib/web/*) \
+ lib/web/* \
$(LIBDIR)/web
%/all:
$(MAKE) -C $* all

0 comments on commit b045a23

Please sign in to comment.