diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2017-04-06 16:31:39 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2017-04-06 16:31:39 -0700 |
| commit | 63f68f5ea3ad00177e222ded3126418e8848014d (patch) | |
| tree | b1ada152e74fb90cd604247afd7fe9219a906d73 | |
| parent | c822585e777621e491e1207ec371d303624c7870 (diff) | |
| parent | 79570527b3e9f7694371022d7bd619d242fcd971 (diff) | |
| download | nasm-63f68f5ea3ad00177e222ded3126418e8848014d.tar.gz | |
Merge branch 'master' of ssh://repo.or.cz/nasm
| -rw-r--r-- | nsis/nasm.nsi | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/nsis/nasm.nsi b/nsis/nasm.nsi index a021bd55..871f23a9 100644 --- a/nsis/nasm.nsi +++ b/nsis/nasm.nsi @@ -26,8 +26,8 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -!addincludedir "${objdir}/nsis" -!addincludedir "${srcdir}/nsis" +!addincludedir "${objdir}\nsis" +!addincludedir "${srcdir}\nsis" !include "version.nsh" !include /nonfatal "arch.nsh" !include /nonfatal "x64.nsh" @@ -53,7 +53,7 @@ SetCompressor lzma ;Name and file Name "${PACKAGE_NAME}" -OutFile "${objdir}/${PACKAGE_SHORT_NAME}-installer-${ARCH}.exe" +OutFile "${objdir}\${PACKAGE_SHORT_NAME}-installer-${ARCH}.exe" ;Get installation folder from registry if available InstallDirRegKey HKCU "Software\${PRODUCT_SHORT_NAME}" "" @@ -70,8 +70,8 @@ Var CmdFailed ;-------------------------------- ;Interface Settings Caption "${PACKAGE_SHORT_NAME} installation" -Icon "${srcdir}/nsis/nasm.ico" -UninstallIcon "${srcdir}/nsis/nasm-un.ico" +Icon "${srcdir}\nsis\nasm.ico" +UninstallIcon "${srcdir}\nsis\nasm-un.ico" !define MUI_ABORTWARNING @@ -101,10 +101,10 @@ UninstallIcon "${srcdir}/nsis/nasm-un.ico" Section "NASM" SecNasm Sectionin RO SetOutPath "$INSTDIR" - File "${srcdir}/LICENSE" - File "${objdir}/nasm.exe" - File "${objdir}/ndisasm.exe" - File "${srcdir}/nsis/nasm.ico" + File "${srcdir}\LICENSE" + File "${objdir}\nasm.exe" + File "${objdir}\ndisasm.exe" + File "${srcdir}\nsis\nasm.ico" ;Store installation folder WriteRegStr HKCU "Software\${PRODUCT_SHORT_NAME}" "" $INSTDIR @@ -140,27 +140,27 @@ skip: SectionEnd Section "RDOFF" SecRdoff - File "${objdir}/rdoff/ldrdf.exe" - File "${objdir}/rdoff/rdf2bin.exe" - File "${objdir}/rdoff/rdf2com.exe" - File "${objdir}/rdoff/rdf2ith.exe" - File "${objdir}/rdoff/rdf2ihx.exe" - File "${objdir}/rdoff/rdf2srec.exe" - File "${objdir}/rdoff/rdfdump.exe" - File "${objdir}/rdoff/rdflib.exe" + File "${objdir}\rdoff\ldrdf.exe" + File "${objdir}\rdoff\rdf2bin.exe" + File "${objdir}\rdoff\rdf2com.exe" + File "${objdir}\rdoff\rdf2ith.exe" + File "${objdir}\rdoff\rdf2ihx.exe" + File "${objdir}\rdoff\rdf2srec.exe" + File "${objdir}\rdoff\rdfdump.exe" + File "${objdir}\rdoff\rdflib.exe" SectionEnd Section "Manual" SecManual SetOutPath "$INSTDIR" - File "${objdir}/doc/nasmdoc.pdf" + File "${objdir}\doc\nasmdoc.pdf" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Manual.lnk" "$INSTDIR\nasmdoc.pdf" SectionEnd Section "VS8 integration" SecVS8 CreateDirectory "$INSTDIR\VSrules" SetOutPath "$INSTDIR\VSrules" - File "${srcdir}/contrib/VSrules/nasm.README" - File "${srcdir}/contrib/VSrules/nasm.rules" + File "${srcdir}\contrib\VSrules\nasm.README" + File "${srcdir}\contrib\VSrules\nasm.rules" SectionEnd ;-------------------------------- |