econf: update configure/config.{sub,guess} atomically to avoid races

[portage.git] / Makefile

diff --git a/Makefile b/Makefile
index be2e0891b30f33d4613cc35eb3bea969ce13da04..92ea195629bbf96583f1d42577aaed5fbc6eff70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ INSMODE = 0644
 EXEMODE = 0755
 DIRMODE = 0755
 SYSCONFDIR_FILES = etc-update.conf dispatch-conf.conf
-PORTAGE_CONFDIR_FILES = make.globals
+PORTAGE_CONFDIR_FILES = make.conf.example make.globals repos.conf
 LOGROTATE_FILES = elog-save-summary
 BINDIR_FILES = ebuild egencache emerge emerge-webrsync \
        emirrordist portageq quickpkg repoman
@@ -51,8 +51,6 @@ docbook:
 
 epydoc:
        set -e; \
-       # workaround for bug 282760 \
-       touch "$(srcdir)/pym/pysqlite2.py"; \
        env PYTHONPATH="$(PYTHONPATH)" epydoc \
                -o "$(WORKDIR)/epydoc" \
                --name $(PN) \
@@ -64,9 +62,7 @@ epydoc:
                -e s:^pym/:: \
                -e s:/:.:g \
                | sort); \
-       rm -f "$(srcdir)/pym/pysqlite2.py"* \
-               "$(WORKDIR)/epydoc/pysqlite2-"* \
-               "$(WORKDIR)/epydoc/api-objects.txt"; \
+       rm -f "$(WORKDIR)/epydoc/api-objects.txt"; \
 
 test:
        set -e; \
@@ -82,9 +78,6 @@ install:
        cd "$(srcdir)/cnf"; \
        install -m$(INSMODE) $(PORTAGE_CONFDIR_FILES) \
                "$(DESTDIR)$(portage_confdir)"; \
-       install -m$(INSMODE) "$(srcdir)/cnf/make.conf" \
-               "$(DESTDIR)$(portage_confdir)/make.conf.example"; \
-       \
        install -d -m$(DIRMODE) "$(DESTDIR)$(portage_setsdir)"; \
        cd "$(S)/cnf/sets"; \
        install -m$(INSMODE) *.conf "$(DESTDIR)$(portage_setsdir)"; \
@@ -217,7 +210,6 @@ install:
 clean:
        set -e; \
        $(MAKE) -C "$(srcdir)/doc" clean; \
-       rm -rf "$(srcdir)/pym/pysqlite2.py"* \
-               "$(WORKDIR)/epydoc"; \
+       rm -rf "$(WORKDIR)/epydoc"; \
 
 .PHONY: all clean docbook epydoc install test