diff packaging/tmp-createpackage.sh.in @ 500:4f972b1f4996

Fix packaging information generation
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 25 Apr 2014 10:29:59 +0000
parents 7a8f5b85fd9a
children 70138fbced95
line wrap: on
line diff
--- a/packaging/tmp-createpackage.sh.in	Fri Apr 25 10:16:46 2014 +0000
+++ b/packaging/tmp-createpackage.sh.in	Fri Apr 25 10:29:59 2014 +0000
@@ -10,8 +10,7 @@
 #NSSDIR is hackish as this will be replaced by static compiling 
 # anyway
 
-NSSDIR="@NSS_INCLUDE_DIRS@/../bin/"
-MYPATH=$(dirname `readlink -f $0`)
+NSSDIR="@NSS_BASE_DIR@/bin/"
 
 TMPDIR=$(mktemp -d)
 
@@ -24,7 +23,7 @@
 makensis -Dfiles_dir=$TMPDIR \
     -Dcompany="Bundesamt für Sicherheit in der Informationstechnik" \
     -Dversion_number=@PROJECT_VERSION@ \
-    -Dsetupname="TrustBridge-@PROJECT_VERSION@.exe" \
+    -Dsetupname="@CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.exe" \
     -Dproductname="TrustBridge" \
-    -Dproductname_short="TrustBridge" $MYPATH/trustbridge.nsi
+    -Dproductname_short="TrustBridge" @CMAKE_SOURCE_DIR@/packaging/trustbridge.nsi
 rm -r $TMPDIR

http://wald.intevation.org/projects/trustbridge/