Merge patch for better installs on POSIX platforms.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4486 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
c16ca4f9fc
commit
0913023f33
25 changed files with 286 additions and 134 deletions
|
@ -364,12 +364,12 @@ side.<br />
|
|||
"parameter">ui_file</span><br />
|
||||
The interface files with a customized dialog resource IDD_SELCOM
|
||||
with a small description area.<br />
|
||||
<em>Default: {NSISDIR}\Contrib\UIs\modern_smalldesc.exe</em></p>
|
||||
<em>Default: ${NSISDIR}\Contrib\UIs\modern_smalldesc.exe</em></p>
|
||||
<p><strong>MUI_UI_COMPONENTSPAGE_NODESC</strong> <span class=
|
||||
"parameter">ui_file</span><br />
|
||||
The interface files with a customized dialog resource IDD_SELCOM
|
||||
without a description area.<br />
|
||||
<em>Default: {NSISDIR}\Contrib\UIs\modern_nodesc.exe</em></p>
|
||||
<em>Default: ${NSISDIR}\Contrib\UIs\modern_nodesc.exe</em></p>
|
||||
</div>
|
||||
<h3><img class="trigger" alt="Open/Close section" id="trigger_inwf"
|
||||
src="images/closed.gif" onclick=
|
||||
|
|
|
@ -77,7 +77,9 @@ Import('defenv')
|
|||
def join(prefix, list):
|
||||
return map(lambda x: '%s/%s' % (prefix, x), list)
|
||||
|
||||
defenv.DistributeDocs(target, docs)
|
||||
defenv.DistributeDocs('%s/%s' % (target, 'images'), join('images', doc_images))
|
||||
defenv.DistributeContribs(target, contribs)
|
||||
defenv.DistributeContribs('%s/%s' % (target, 'Language files'), join('Language files', languages))
|
||||
defenv.DistributeDocs(docs, path=target)
|
||||
path = 'images'
|
||||
defenv.DistributeDocs(join(path,doc_images), path='%s/%s'%(target,path))
|
||||
defenv.DistributeContrib(contribs, path=target)
|
||||
path = 'Language files'
|
||||
defenv.DistributeContrib(join(path,languages), path='%s/%s'%(target,path))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue