# HG changeset patch # User Norm Jacobs # Date 1376601284 25200 # Node ID 1a65a9df6f2e15c65fe676d2005111af257064e7 # Parent d2ccaa434c25002ad07fb285df34668c95054d04 17300973 ips.mk is a little racey diff -r d2ccaa434c25 -r 1a65a9df6f2e make-rules/ips.mk --- a/make-rules/ips.mk Wed Aug 14 12:01:30 2013 -0700 +++ b/make-rules/ips.mk Thu Aug 15 14:14:44 2013 -0700 @@ -177,14 +177,14 @@ # appropriate conditional dependencies into a python library's # runtime-version-generic package to pull in the version-specific bits when the # corresponding version of python is on the system. -$(WS_TOP)/transforms/mkgeneric-python: $(WS_TOP)/make-rules/shared-macros.mk +$(BUILD_DIR)/mkgeneric-python: $(WS_TOP)/make-rules/shared-macros.mk $(RM) $@ $(foreach ver,$(shell echo $(PYTHON_VERSIONS) | tr -d .), \ $(call mkgeneric,runtime/python,$(ver))) # Build Python version-wrapping manifests from the generic version. -$(MANIFEST_BASE)-%.p5m: %-PYVER.p5m $(WS_TOP)/transforms/mkgeneric-python - $(PKGMOGRIFY) -D PYV=### $(WS_TOP)/transforms/mkgeneric-python \ +$(MANIFEST_BASE)-%.p5m: %-PYVER.p5m $(BUILD_DIR)/mkgeneric-python + $(PKGMOGRIFY) -D PYV=### $(BUILD_DIR)/mkgeneric-python \ $(WS_TOP)/transforms/mkgeneric $< > $@ if [ -f $*-GENFRAG.p5m ]; then cat $*-GENFRAG.p5m >> $@; fi @@ -201,14 +201,14 @@ # appropriate conditional dependencies into a perl library's # runtime-version-generic package to pull in the version-specific bits when the # corresponding version of perl is on the system. -$(WS_TOP)/transforms/mkgeneric-perl: $(WS_TOP)/make-rules/shared-macros.mk +$(BUILD_DIR)/mkgeneric-perl: $(WS_TOP)/make-rules/shared-macros.mk $(RM) $@ $(foreach ver,$(shell echo $(PERL_VERSIONS) | tr -d .), \ $(call mkgeneric,runtime/perl,$(ver))) # Build Perl version-wrapping manifests from the generic version. -$(MANIFEST_BASE)-%.p5m: %-PERLVER.p5m $(WS_TOP)/transforms/mkgeneric-perl - $(PKGMOGRIFY) -D PLV=### $(WS_TOP)/transforms/mkgeneric-perl \ +$(MANIFEST_BASE)-%.p5m: %-PERLVER.p5m $(BUILD_DIR)/mkgeneric-perl + $(PKGMOGRIFY) -D PLV=### $(BUILD_DIR)/mkgeneric-perl \ $(WS_TOP)/transforms/mkgeneric $< > $@ if [ -f $*-GENFRAG.p5m ]; then cat $*-GENFRAG.p5m >> $@; fi