i'm not sure why the previous fix fails only on linux, but here is another attempt...

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6780 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2016-07-25 01:26:53 +00:00
parent 74a90ebedd
commit 3b8afc2e89

View file

@ -66,6 +66,7 @@ DOCS_CONFIG = {
}, },
'NSISDOCTARGET' : 'NSIS.chm', 'NSISDOCTARGET' : 'NSIS.chm',
'NSISDOCINSTALLBASEPATH' : '', 'NSISDOCINSTALLBASEPATH' : '',
'NSISEXTRADIST' : [],
}, },
'html' : 'html' :
{ {
@ -75,8 +76,9 @@ DOCS_CONFIG = {
'NSISDOCHTMLFIXES' : 'NSISDOCHTMLFIXES' :
{ {
}, },
'NSISDOCTARGET' : htmls + ['style.css'], 'NSISDOCTARGET' : htmls,
'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath, 'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath,
'NSISEXTRADIST' : File(Split('#Docs/style.css')),
}, },
'htmlsingle' : 'htmlsingle' :
{ {
@ -89,6 +91,7 @@ DOCS_CONFIG = {
}, },
'NSISDOCTARGET' : 'Manual.html', 'NSISDOCTARGET' : 'Manual.html',
'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath, 'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath,
'NSISEXTRADIST' : [],
}, },
} }
@ -172,4 +175,4 @@ env['SPAWN'] = new_spawn
# BUILD! # BUILD!
docs = env.Halibut(env['NSISDOCTARGET'], ['$NSISDOCCONFIG'] + buts) docs = env.Halibut(env['NSISDOCTARGET'], ['$NSISDOCCONFIG'] + buts)
env.DistributeDocs(docs, basepath=env['NSISDOCINSTALLBASEPATH']) env.DistributeDocs(docs + env['NSISEXTRADIST'], basepath=env['NSISDOCINSTALLBASEPATH'])