]> arthur.barton.de Git - bup.git/commitdiff
Don't use $(wildcard) during 'make install'. bup-0.17a
authorAvery Pennarun <apenwarr@gmail.com>
Sat, 4 Sep 2010 23:42:47 +0000 (16:42 -0700)
committerAvery Pennarun <apenwarr@gmail.com>
Sat, 4 Sep 2010 23:45:11 +0000 (16:45 -0700)
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>
Makefile

index 531afecd49d122edf6ce0f3cb07d241c8611be17..65a8e3d8c22ace200b2abe915a1b0ef48c07889c 100644 (file)
--- a/Makefile
+++ b/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