From 3b8afc2e89740323d27dda962ecdd99512870611 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 25 Jul 2016 01:26:53 +0000 Subject: [PATCH] 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 --- Docs/src/SConscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Docs/src/SConscript b/Docs/src/SConscript index c302c774..61d010c9 100644 --- a/Docs/src/SConscript +++ b/Docs/src/SConscript @@ -66,6 +66,7 @@ DOCS_CONFIG = { }, 'NSISDOCTARGET' : 'NSIS.chm', 'NSISDOCINSTALLBASEPATH' : '', + 'NSISEXTRADIST' : [], }, 'html' : { @@ -75,8 +76,9 @@ DOCS_CONFIG = { 'NSISDOCHTMLFIXES' : { }, - 'NSISDOCTARGET' : htmls + ['style.css'], + 'NSISDOCTARGET' : htmls, 'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath, + 'NSISEXTRADIST' : File(Split('#Docs/style.css')), }, 'htmlsingle' : { @@ -89,6 +91,7 @@ DOCS_CONFIG = { }, 'NSISDOCTARGET' : 'Manual.html', 'NSISDOCINSTALLBASEPATH' : docsdefault_install_basepath, + 'NSISEXTRADIST' : [], }, } @@ -172,4 +175,4 @@ env['SPAWN'] = new_spawn # BUILD! docs = env.Halibut(env['NSISDOCTARGET'], ['$NSISDOCCONFIG'] + buts) -env.DistributeDocs(docs, basepath=env['NSISDOCINSTALLBASEPATH']) +env.DistributeDocs(docs + env['NSISEXTRADIST'], basepath=env['NSISDOCINSTALLBASEPATH'])