bpo-32430: Rename Modules/Setup.dist to Modules/Setup (GH-8229) · python/cpython@961d54c

@@ -687,26 +687,16 @@ oldsharedmods: $(SHAREDMODS)

687687

Makefile Modules/config.c: Makefile.pre \

688688

$(srcdir)/Modules/config.c.in \

689689

$(MAKESETUP) \

690-

Modules/Setup \

690+

$(srcdir)/Modules/Setup \

691691

Modules/Setup.local

692692

$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \

693693

-s Modules \

694694

Modules/Setup.local \

695-

Modules/Setup

695+

$(srcdir)/Modules/Setup

696696

@mv config.c Modules

697697

@echo "The Makefile was updated, you may need to re-run make."

698698699699700-

Modules/Setup: $(srcdir)/Modules/Setup.dist

701-

@if test -f Modules/Setup; then \

702-

echo "-----------------------------------------------"; \

703-

echo "Modules/Setup.dist is newer than Modules/Setup;"; \

704-

echo "check to make sure you have all the updates you"; \

705-

echo "need in your Modules/Setup file."; \

706-

echo "Usually, copying Modules/Setup.dist to Modules/Setup will work."; \

707-

echo "-----------------------------------------------"; \

708-

fi

709-710700

Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)

711701

$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)

712702

@@ -1478,7 +1468,7 @@ libainstall: @DEF_MAKE_RULE@ python-config

14781468

$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o

14791469

$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in

14801470

$(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile

1481-

$(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup

1471+

$(INSTALL_DATA) $(srcdir)/Modules/Setup $(DESTDIR)$(LIBPL)/Setup

14821472

$(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local

14831473

$(INSTALL_DATA) Misc/python.pc $(DESTDIR)$(LIBPC)/python-$(VERSION).pc

14841474

$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup

@@ -1701,8 +1691,7 @@ distclean: clobber

17011691

for file in $(srcdir)/Lib/test/data/* ; do \

17021692

if test "$$file" != "$(srcdir)/Lib/test/data/README"; then rm "$$file"; fi; \

17031693

done

1704-

-rm -f core Makefile Makefile.pre config.status \

1705-

Modules/Setup Modules/Setup.local \

1694+

-rm -f core Makefile Makefile.pre config.status Modules/Setup.local \

17061695

Modules/ld_so_aix Modules/python.exp Misc/python.pc \

17071696

Misc/python-config.sh

17081697

-rm -f python*-gdb.py