1c1
< # $Id: meta.stage.mk,v 1.17 2013/01/24 01:02:23 sjg Exp $
---
> # $Id: meta.stage.mk,v 1.24 2013/03/23 02:25:19 sjg Exp $
50a51,55
> LN_CP_SCRIPT = LnCp() { \
> rm -f $$2 2> /dev/null; \
> ln $$1 $$2 2> /dev/null || \
> cp -p $$1 $$2; }
>
53c58
< STAGE_DIRDEP_SCRIPT = StageDirdep() { \
---
> STAGE_DIRDEP_SCRIPT = ${LN_CP_SCRIPT}; StageDirdep() { \
60,61c65
< ln .dirdep $$t.dirdep 2> /dev/null || \
< cp .dirdep $$t.dirdep; }
---
> LnCp .dirdep $$t.dirdep || exit 1; }
67c71
< case "$$1" in -m) mode=$$2; shift 2;; *) mode=;; esac; \
---
> case "$$1" in "") return;; -m) mode=$$2; shift 2;; *) mode=;; esac; \
74,77c78,79
< rm -f $$t; \
< { ln $$f $$t 2> /dev/null || \
< cp -p $$f $$t; }; \
< $${mode:+chmod $$mode $$t}; \
---
> LnCp $$f $$t || exit 1; \
> [ -z "$$mode" ] || chmod $$mode $$t; \
81c83
< case "$$1" in --) shift;; -*) ldest= lnf=$$1; shift;; /*) ldest=$$1/;; esac; \
---
> case "$$1" in "") return;; --) shift;; -*) ldest= lnf=$$1; shift;; /*) ldest=$$1/;; esac; \
92c94
< ln $$lnf $$l $$t; \
---
> ln $$lnf $$l $$t || exit 1; \
96c98
< case "$$1" in -m) mode=$$2; shift 2;; *) mode=;; esac; \
---
> case "$$1" in "") return;; -m) mode=$$2; shift 2;; *) mode=;; esac; \
106,109c108,109
< rm -f $$t; \
< { ln $$s $$t 2> /dev/null || \
< cp -p $$s $$t; }; \
< $${mode:+chmod $$mode $$t}; \
---
> LnCp $$s $$t || exit 1; \
> [ -z "$$mode" ] || chmod $$mode $$t; \
117,118c117
< CLEANFILES += stage_incs
<
---
> STAGE_TARGETS += stage_incs
127c126
< CLEANFILES += stage_libs
---
> STAGE_TARGETS += stage_libs
155d153
<
164a163
> STAGE_TARGETS += stage_files
173a173
> STAGE_TARGETS += stage_links
182a183
> STAGE_TARGETS += stage_symlinks
197a199,200
> STAGE_TARGETS += stage_as
>
211a215,230
> CLEANFILES += ${STAGE_TARGETS}
>
> # stage_*links usually needs to follow any others.
> .for t in ${STAGE_TARGETS:N*links:O:u}
> .ORDER: $t stage_links
> .ORDER: $t stage_symlinks
> .endfor
>
> # make sure this exists
> staging:
>
> # generally we want staging to wait until everything else is done
> STAGING_WAIT ?= .WAIT
>
> all: ${STAGING_WAIT} staging
>