diff options
| author | Rickard Green <rickard@erlang.org> | 2021-05-04 00:08:59 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2021-05-04 00:08:59 +0200 |
| commit | b8452841d1cc31440763b6f260ee7407c4c1686d (patch) | |
| tree | 60c33da7de21362f04566db92beff4353d2636c1 /Makefile.in | |
| parent | ed2aee59bd43ff1cd0ac29a9b4bc2ecd5ba6ebdc (diff) | |
| parent | 0cd368507351295a5e727768a3b9bf1d548197f1 (diff) | |
| download | erlang-b8452841d1cc31440763b6f260ee7407c4c1686d.tar.gz | |
Merge branch 'wojtekmach/wm-jinterface' into rickard/wojtekmach/wm-jinterface
* wojtekmach/wm-jinterface:
Makefile.in: Skip lib/jinterface/priv if missing
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index b8c07a31f1..4c1a8f74f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -832,7 +832,8 @@ tertiary_bootstrap_copy: true; \ done # copy jinterface priv directory - $(V_at)for x in lib/jinterface/priv/OtpErlang.jar; do \ + $(V_at)if test -d lib/jinterface/priv; then \ + for x in lib/jinterface/priv/OtpErlang.jar; do \ BN=`basename $$x`; \ TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/jinterface/priv/$$BN; \ test -f $$TF && \ @@ -841,8 +842,8 @@ tertiary_bootstrap_copy: test '!' -f $$TF && \ ${INSTALL_DATA} -p $$x $$TF; \ true; \ - done - $(V_at)for x in lib/jinterface/priv/com/ericsson/otp/erlang/*; do \ + done; \ + for x in lib/jinterface/priv/com/ericsson/otp/erlang/*; do \ BN=`basename $$x`; \ TF=$(BOOTSTRAP_ROOT)/bootstrap/lib/jinterface/priv/com/ericsson/otp/erlang/$$BN; \ test -f $$TF && \ @@ -851,7 +852,8 @@ tertiary_bootstrap_copy: test '!' -f $$TF && \ ${INSTALL_DATA} -p $$x $$TF; \ true; \ - done + done; \ + fi # $(V_at)${INSTALL_DATA} -p lib/syntax_tools/ebin/*.beam $(BOOTSTRAP_ROOT)/bootstrap/lib/syntax_tools/ebin doc_bootstrap_build: |