use PATH instead of hardwired pathlets
bin/ prefix tried to become a permatemp(tm). No way.
This commit is contained in:
parent
68022a3222
commit
665c70a444
4
Makefile
4
Makefile
@ -12,10 +12,12 @@ endif
|
||||
endif
|
||||
export ARCHES
|
||||
|
||||
export PATH := $(CURDIR)/bin:$(PATH)
|
||||
|
||||
# supervise target tracing; leave stderr alone
|
||||
ifdef REPORT
|
||||
export REPORT_PATH := $(shell mktemp --tmpdir mkimage-profiles.report.XXXXXXX)
|
||||
POSTPROC := | bin/report-filter > $(REPORT_PATH)
|
||||
POSTPROC := | report-filter > $(REPORT_PATH)
|
||||
endif
|
||||
|
||||
# recursive make considered useful for m-p
|
||||
|
@ -47,7 +47,8 @@ add_feature = $(call add,FEATURES,$(word 2,$(subst /, ,$@)))
|
||||
|
||||
# convert tag list into a list of relative package list paths
|
||||
# NB: tags can do boolean expressions: (tag1 && !(tag2 || tag3))
|
||||
tags = $(and $(strip $(1)),$(addprefix tagged/,$(shell echo "$(1)" | bin/tags2lists pkg.in/lists/tagged)))
|
||||
tags = $(and $(strip $(1)),$(addprefix tagged/,$(shell echo "$(1)" \
|
||||
| tags2lists pkg.in/lists/tagged)))
|
||||
|
||||
# toplevel Makefile convenience
|
||||
addsuffices = $(foreach s,$(1),$(call addsuffix,$s,$(2)))
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
help/distro:
|
||||
@echo '** available distribution targets:'; \
|
||||
bin/columnize $(sort $(DISTROS:distro/%=%))
|
||||
columnize $(sort $(DISTROS:distro/%=%))
|
||||
|
||||
help/ve:
|
||||
@echo '** available virtual environment targets:'; \
|
||||
bin/columnize $(sort $(VES))
|
||||
columnize $(sort $(VES))
|
||||
|
||||
help: | help/distro help/space help/ve; @:
|
||||
help/space:; @echo
|
||||
|
@ -15,7 +15,7 @@ if [ -s "$(SYMLINK)" -a "$(NUM_TARGETS)" = 1 ] && \
|
||||
then \
|
||||
echo "$(BUILDLINK)"; \
|
||||
else \
|
||||
bin/mktmpdir $(BUILDDIR_PREFIX) || exit 200; \
|
||||
mktmpdir $(BUILDDIR_PREFIX) || exit 200; \
|
||||
fi; )
|
||||
endif
|
||||
|
||||
@ -26,9 +26,7 @@ endif
|
||||
# even smart caching only hurts when every build goes from scratch
|
||||
NO_CACHE ?= 1
|
||||
|
||||
PATH := $(CURDIR)/bin:$(PATH)
|
||||
|
||||
export BUILDDIR NO_CACHE PATH
|
||||
export BUILDDIR NO_CACHE
|
||||
|
||||
CONFIG := $(BUILDDIR)/distcfg.mk
|
||||
RC := $(HOME)/.mkimage/profiles.mk
|
||||
|
2
main.mk
2
main.mk
@ -6,7 +6,7 @@
|
||||
# --- in BUILDDIR
|
||||
# 4. build subprofiles and subsequently an image
|
||||
|
||||
MKIMAGE_PROFILES = $(dir $(lastword $(MAKEFILE_LIST)))
|
||||
MKIMAGE_PROFILES := $(dir $(lastword $(MAKEFILE_LIST)))
|
||||
|
||||
# deal with one target at a time
|
||||
IMAGE_TARGET := $(firstword $(MAKECMDGOALS))# ve/generic.tar.gz
|
||||
|
@ -7,7 +7,7 @@ reports/targets:
|
||||
BUILDDIR="`sed -n 's/^.* BUILDDIR = \(.*\)/\1/p' \
|
||||
"$$REPORT_PATH"`"; \
|
||||
REPORT_IMAGE="$$BUILDDIR/targets.png"; \
|
||||
bin/report-targets < "$$REPORT_PATH" \
|
||||
report-targets < "$$REPORT_PATH" \
|
||||
| dot -Tpng -o "$$REPORT_IMAGE" \
|
||||
&& echo "** target graph report: $$REPORT_IMAGE" \
|
||||
&& mv "$$REPORT_PATH" "$$BUILDDIR/targets.log"; \
|
||||
|
Loading…
Reference in New Issue
Block a user