From a1b95f0c4f86c657bcdc893b30fa9d0c47df919c Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 22 Jul 2017 02:25:57 +0200 Subject: NSIS: Distribution directory can already be set on command line Use 'makensis /DINKSCAPE_DIST_DIR=..\..\build\inkscape inkscape.nsi'. (cherry picked from commit 3534f9a0013a155a1d31e837e12e73eb8678dbb0) --- packaging/win32/inkscape.nsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging') diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 497a31a64..ba6b5c7b1 100644 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -121,8 +121,8 @@ ReserveFile /plugin UserInfo.dll ; SETTINGS ; ####################################### -; Find inkscape distribution directory (uncomment line below to manually define) -!define INKSCAPE_DIST_DIR ..\..\build64\inkscape +; Find inkscape distribution directory (define on command line or uncomment line below to manually define) +;!define INKSCAPE_DIST_DIR ..\..\build\inkscape !ifdef INKSCAPE_DIST_DIR ${!defineifexist} ${INKSCAPE_DIST_DIR}\inkscape.exe FOUND 1 !ifndef FOUND -- cgit v1.2.3