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
This commit is contained in:
parent
90d46a5c43
commit
e7f2fa91bc
@ -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 ;
|
||||
|
Loading…
Reference in New Issue
Block a user