Have clean depend on bup-python so tools can too

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index b2f337ab5602b64207217d636a6a0deb1c511cac..0be621fd97bd3164c3fb73d80c8c9bdc650e41e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ initial_setup := $(call shout,$(initial_setup),Version configuration failed))
 
 config/config.vars: configure config/configure config/configure.inc \
   $(wildcard config/*.in)
-       ./configure
+       MAKE="$(MAKE)" ./configure
 
 bup_cmds := cmd/bup-python\
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
@@ -79,7 +79,7 @@ man_roff := $(patsubst %.md,%.1,$(man_md))
 man_html := $(patsubst %.md,%.html,$(man_md))
 
 INSTALL=install
-PREFIX=/usr
+PREFIX=/usr/local
 MANDIR=$(DESTDIR)$(PREFIX)/share/man
 DOCDIR=$(DESTDIR)$(PREFIX)/share/doc/bup
 BINDIR=$(DESTDIR)$(PREFIX)/bin
@@ -110,11 +110,6 @@ install: all
        $(INSTALL) -pm 0644 \
                lib/web/*.html \
                $(LIBDIR)/web/
-%/all:
-       $(MAKE) -C $* all
-
-%/clean:
-       $(MAKE) -C $* clean
 
 config/config.h: config/config.vars
 
@@ -256,12 +251,13 @@ import-docs: Documentation/clean
        $(pf); git archive origin/html | (cd Documentation && tar -xvf -)
        $(pf); git archive origin/man | (cd Documentation && tar -xvf -)
 
-clean: Documentation/clean config/clean
+clean: Documentation/clean cmd/bup-python
+       cd config && rm -f *~ .*~ \
+         ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
        rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \
-               bup bup-* cmd/bup-* \
-               cmd/python-cmd.sh \
+               bup bup-* \
                randomgen memtest \
                testfs.img lib/bup/t/testfs.img
        if test -e t/mnt; then t/cleanup-mounts-under t/mnt; fi
@@ -274,3 +270,5 @@ clean: Documentation/clean config/clean
        if test -e t/tmp; then t/force-delete t/tmp; fi
        ./configure-version --clean
        t/configure-sampledata --clean
+        # Remove last so that cleanup tools can depend on it
+       rm -f cmd/bup-* cmd/python-cmd.sh