From e7f2fa91bc681fb02ceef5b722ef0f6e57f79372 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 8 Apr 2009 18:03:18 +0000 Subject: [PATCH] Don't use MakeLocate to make sure that the parent directory exists, since that also sets LOCATE, which could cause jam to incorrectly place our directory. Should fix the problems with the SSL build feature some people have been seeing. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30039 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FileRules | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/jam/FileRules b/build/jam/FileRules index e73123be3b..6d137800aa 100644 --- a/build/jam/FileRules +++ b/build/jam/FileRules @@ -224,8 +224,12 @@ rule UnzipArchive directory : entries : zipFile : grist # one-time initialization for the main target (the directory) if ! [ on $(directory) return $(INITIALIZED) ] { + # make sure the parent dir exists + local parentDir = $(directory:PG=dir) ; + Depends $(directory) : $(parentDir) ; + MkDir $(parentDir) ; + NoUpdate $(directory) ; - MakeLocate $(directory) : $(directory:P) ; Depends $(directory) : $(zipFile) ; UnzipArchive1 $(directory) : $(zipFile) ; INITIALIZED on $(directory) = 1 ;