Skip to content

Commit c747a0f

Browse files
gvanrossumgvanrossum
committed
Don't use $@ and $<, they don't work on FreeBSD
1 parent 0c9de73 commit c747a0f

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

‎Makefile.pre.in

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -795,124 +795,124 @@ DEEPFREEZE_DEPS = \
795795
# BEGIN: deepfreeze modules
796796

797797
Python/deepfreeze/importlib._bootstrap.c: $(srcdir)/Lib/importlib/_bootstrap.py $(DEEPFREEZE_DEPS)
798-
@echo "Deepfreezing $@ from $<"
798+
@echo "Deepfreezing Python/deepfreeze/importlib._bootstrap.c from Lib/importlib/_bootstrap.py"
799799
@./$(BOOTSTRAP) \
800800
$(srcdir)/Tools/scripts/deepfreeze.py \
801-
$< -m importlib._bootstrap -o $@
801+
Lib/importlib/_bootstrap.py -m importlib._bootstrap -o Python/deepfreeze/importlib._bootstrap.c
802802

803803
Python/deepfreeze/importlib._bootstrap_external.c: $(srcdir)/Lib/importlib/_bootstrap_external.py $(DEEPFREEZE_DEPS)
804-
@echo "Deepfreezing $@ from $<"
804+
@echo "Deepfreezing Python/deepfreeze/importlib._bootstrap_external.c from Lib/importlib/_bootstrap_external.py"
805805
@./$(BOOTSTRAP) \
806806
$(srcdir)/Tools/scripts/deepfreeze.py \
807-
$< -m importlib._bootstrap_external -o $@
807+
Lib/importlib/_bootstrap_external.py -m importlib._bootstrap_external -o Python/deepfreeze/importlib._bootstrap_external.c
808808

809809
Python/deepfreeze/zipimport.c: $(srcdir)/Lib/zipimport.py $(DEEPFREEZE_DEPS)
810-
@echo "Deepfreezing $@ from $<"
810+
@echo "Deepfreezing Python/deepfreeze/zipimport.c from Lib/zipimport.py"
811811
@./$(BOOTSTRAP) \
812812
$(srcdir)/Tools/scripts/deepfreeze.py \
813-
$< -m zipimport -o $@
813+
Lib/zipimport.py -m zipimport -o Python/deepfreeze/zipimport.c
814814

815815
Python/deepfreeze/abc.c: $(srcdir)/Lib/abc.py $(DEEPFREEZE_DEPS)
816-
@echo "Deepfreezing $@ from $<"
816+
@echo "Deepfreezing Python/deepfreeze/abc.c from Lib/abc.py"
817817
@./$(BOOTSTRAP) \
818818
$(srcdir)/Tools/scripts/deepfreeze.py \
819-
$< -m abc -o $@
819+
Lib/abc.py -m abc -o Python/deepfreeze/abc.c
820820

821821
Python/deepfreeze/codecs.c: $(srcdir)/Lib/codecs.py $(DEEPFREEZE_DEPS)
822-
@echo "Deepfreezing $@ from $<"
822+
@echo "Deepfreezing Python/deepfreeze/codecs.c from Lib/codecs.py"
823823
@./$(BOOTSTRAP) \
824824
$(srcdir)/Tools/scripts/deepfreeze.py \
825-
$< -m codecs -o $@
825+
Lib/codecs.py -m codecs -o Python/deepfreeze/codecs.c
826826

827827
Python/deepfreeze/io.c: $(srcdir)/Lib/io.py $(DEEPFREEZE_DEPS)
828-
@echo "Deepfreezing $@ from $<"
828+
@echo "Deepfreezing Python/deepfreeze/io.c from Lib/io.py"
829829
@./$(BOOTSTRAP) \
830830
$(srcdir)/Tools/scripts/deepfreeze.py \
831-
$< -m io -o $@
831+
Lib/io.py -m io -o Python/deepfreeze/io.c
832832

833833
Python/deepfreeze/_collections_abc.c: $(srcdir)/Lib/_collections_abc.py $(DEEPFREEZE_DEPS)
834-
@echo "Deepfreezing $@ from $<"
834+
@echo "Deepfreezing Python/deepfreeze/_collections_abc.c from Lib/_collections_abc.py"
835835
@./$(BOOTSTRAP) \
836836
$(srcdir)/Tools/scripts/deepfreeze.py \
837-
$< -m _collections_abc -o $@
837+
Lib/_collections_abc.py -m _collections_abc -o Python/deepfreeze/_collections_abc.c
838838

839839
Python/deepfreeze/_sitebuiltins.c: $(srcdir)/Lib/_sitebuiltins.py $(DEEPFREEZE_DEPS)
840-
@echo "Deepfreezing $@ from $<"
840+
@echo "Deepfreezing Python/deepfreeze/_sitebuiltins.c from Lib/_sitebuiltins.py"
841841
@./$(BOOTSTRAP) \
842842
$(srcdir)/Tools/scripts/deepfreeze.py \
843-
$< -m _sitebuiltins -o $@
843+
Lib/_sitebuiltins.py -m _sitebuiltins -o Python/deepfreeze/_sitebuiltins.c
844844

845845
Python/deepfreeze/genericpath.c: $(srcdir)/Lib/genericpath.py $(DEEPFREEZE_DEPS)
846-
@echo "Deepfreezing $@ from $<"
846+
@echo "Deepfreezing Python/deepfreeze/genericpath.c from Lib/genericpath.py"
847847
@./$(BOOTSTRAP) \
848848
$(srcdir)/Tools/scripts/deepfreeze.py \
849-
$< -m genericpath -o $@
849+
Lib/genericpath.py -m genericpath -o Python/deepfreeze/genericpath.c
850850

851851
Python/deepfreeze/ntpath.c: $(srcdir)/Lib/ntpath.py $(DEEPFREEZE_DEPS)
852-
@echo "Deepfreezing $@ from $<"
852+
@echo "Deepfreezing Python/deepfreeze/ntpath.c from Lib/ntpath.py"
853853
@./$(BOOTSTRAP) \
854854
$(srcdir)/Tools/scripts/deepfreeze.py \
855-
$< -m ntpath -o $@
855+
Lib/ntpath.py -m ntpath -o Python/deepfreeze/ntpath.c
856856

857857
Python/deepfreeze/posixpath.c: $(srcdir)/Lib/posixpath.py $(DEEPFREEZE_DEPS)
858-
@echo "Deepfreezing $@ from $<"
858+
@echo "Deepfreezing Python/deepfreeze/posixpath.c from Lib/posixpath.py"
859859
@./$(BOOTSTRAP) \
860860
$(srcdir)/Tools/scripts/deepfreeze.py \
861-
$< -m posixpath -o $@
861+
Lib/posixpath.py -m posixpath -o Python/deepfreeze/posixpath.c
862862

863863
Python/deepfreeze/os.c: $(srcdir)/Lib/os.py $(DEEPFREEZE_DEPS)
864-
@echo "Deepfreezing $@ from $<"
864+
@echo "Deepfreezing Python/deepfreeze/os.c from Lib/os.py"
865865
@./$(BOOTSTRAP) \
866866
$(srcdir)/Tools/scripts/deepfreeze.py \
867-
$< -m os -o $@
867+
Lib/os.py -m os -o Python/deepfreeze/os.c
868868

869869
Python/deepfreeze/site.c: $(srcdir)/Lib/site.py $(DEEPFREEZE_DEPS)
870-
@echo "Deepfreezing $@ from $<"
870+
@echo "Deepfreezing Python/deepfreeze/site.c from Lib/site.py"
871871
@./$(BOOTSTRAP) \
872872
$(srcdir)/Tools/scripts/deepfreeze.py \
873-
$< -m site -o $@
873+
Lib/site.py -m site -o Python/deepfreeze/site.c
874874

875875
Python/deepfreeze/stat.c: $(srcdir)/Lib/stat.py $(DEEPFREEZE_DEPS)
876-
@echo "Deepfreezing $@ from $<"
876+
@echo "Deepfreezing Python/deepfreeze/stat.c from Lib/stat.py"
877877
@./$(BOOTSTRAP) \
878878
$(srcdir)/Tools/scripts/deepfreeze.py \
879-
$< -m stat -o $@
879+
Lib/stat.py -m stat -o Python/deepfreeze/stat.c
880880

881881
Python/deepfreeze/__hello__.c: $(srcdir)/Lib/__hello__.py $(DEEPFREEZE_DEPS)
882-
@echo "Deepfreezing $@ from $<"
882+
@echo "Deepfreezing Python/deepfreeze/__hello__.c from Lib/__hello__.py"
883883
@./$(BOOTSTRAP) \
884884
$(srcdir)/Tools/scripts/deepfreeze.py \
885-
$< -m __hello__ -o $@
885+
Lib/__hello__.py -m __hello__ -o Python/deepfreeze/__hello__.c
886886

887887
Python/deepfreeze/__phello__.c: $(srcdir)/Lib/__phello__/__init__.py $(DEEPFREEZE_DEPS)
888-
@echo "Deepfreezing $@ from $<"
888+
@echo "Deepfreezing Python/deepfreeze/__phello__.c from Lib/__phello__/__init__.py"
889889
@./$(BOOTSTRAP) \
890890
$(srcdir)/Tools/scripts/deepfreeze.py \
891-
$< -m __phello__ -o $@
891+
Lib/__phello__/__init__.py -m __phello__ -o Python/deepfreeze/__phello__.c
892892

893893
Python/deepfreeze/__phello__.ham.c: $(srcdir)/Lib/__phello__/ham/__init__.py $(DEEPFREEZE_DEPS)
894-
@echo "Deepfreezing $@ from $<"
894+
@echo "Deepfreezing Python/deepfreeze/__phello__.ham.c from Lib/__phello__/ham/__init__.py"
895895
@./$(BOOTSTRAP) \
896896
$(srcdir)/Tools/scripts/deepfreeze.py \
897-
$< -m __phello__.ham -o $@
897+
Lib/__phello__/ham/__init__.py -m __phello__.ham -o Python/deepfreeze/__phello__.ham.c
898898

899899
Python/deepfreeze/__phello__.ham.eggs.c: $(srcdir)/Lib/__phello__/ham/eggs.py $(DEEPFREEZE_DEPS)
900-
@echo "Deepfreezing $@ from $<"
900+
@echo "Deepfreezing Python/deepfreeze/__phello__.ham.eggs.c from Lib/__phello__/ham/eggs.py"
901901
@./$(BOOTSTRAP) \
902902
$(srcdir)/Tools/scripts/deepfreeze.py \
903-
$< -m __phello__.ham.eggs -o $@
903+
Lib/__phello__/ham/eggs.py -m __phello__.ham.eggs -o Python/deepfreeze/__phello__.ham.eggs.c
904904

905905
Python/deepfreeze/__phello__.spam.c: $(srcdir)/Lib/__phello__/spam.py $(DEEPFREEZE_DEPS)
906-
@echo "Deepfreezing $@ from $<"
906+
@echo "Deepfreezing Python/deepfreeze/__phello__.spam.c from Lib/__phello__/spam.py"
907907
@./$(BOOTSTRAP) \
908908
$(srcdir)/Tools/scripts/deepfreeze.py \
909-
$< -m __phello__.spam -o $@
909+
Lib/__phello__/spam.py -m __phello__.spam -o Python/deepfreeze/__phello__.spam.c
910910

911911
Python/deepfreeze/frozen_only.c: $(srcdir)/Tools/freeze/flag.py $(DEEPFREEZE_DEPS)
912-
@echo "Deepfreezing $@ from $<"
912+
@echo "Deepfreezing Python/deepfreeze/frozen_only.c from Tools/freeze/flag.py"
913913
@./$(BOOTSTRAP) \
914914
$(srcdir)/Tools/scripts/deepfreeze.py \
915-
$< -m frozen_only -o $@
915+
Tools/freeze/flag.py -m frozen_only -o Python/deepfreeze/frozen_only.c
916916

917917
# END: deepfreeze modules
918918

‎Tools/scripts/freeze_modules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,10 @@ def regen_makefile(modules):
649649

650650
# Also add a deepfreeze rule.
651651
deepfreezerules.append(f'{cfile}: $(srcdir)/{_pyfile} $(DEEPFREEZE_DEPS)')
652-
deepfreezerules.append(f'\t@echo "Deepfreezing $@ from $<"')
652+
deepfreezerules.append(f'\t@echo "Deepfreezing {cfile} from {_pyfile}"')
653653
deepfreezerules.append(f"\t@./$(BOOTSTRAP) \\")
654654
deepfreezerules.append(f"\t\t$(srcdir)/Tools/scripts/deepfreeze.py \\")
655-
deepfreezerules.append(f"\t\t$< -m {src.frozenid} -o $@")
655+
deepfreezerules.append(f"\t\t{_pyfile} -m {src.frozenid} -o {cfile}")
656656
deepfreezerules.append('')
657657

658658
for src in _iter_sources(modules):

0 commit comments

Comments
 (0)