aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/nsis
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-01-23 12:08:15 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-01-23 12:08:15 +0000
commitfceeb16e666cc4fd48a41a76352fbbeeaf6eb35f (patch)
tree2a6fa3959c48c0b3fdb25fc56cadbf9e0b2cb5fa /packaging/nsis
parent260cafb04c8ff616c21ced1187fe35199a0bbd5f (diff)
Make it possible to add custom radius dictionaries. Top Makefile.am needs more modifications to include the file in the tarball.
svn path=/trunk/; revision=47224
Diffstat (limited to 'packaging/nsis')
-rw-r--r--packaging/nsis/Makefile.am1
-rw-r--r--packaging/nsis/custom_radius_dict.txt3
-rw-r--r--packaging/nsis/wireshark.nsi2
3 files changed, 6 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index c1e8ec1c21..c8549ca328 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -16,4 +16,5 @@ EXTRA_DIST = \
Custom.nmake \
custom_plugins.txt \
custom_mibs.txt \
+ custom_radius_dict.txt \
x64.nsh
diff --git a/packaging/nsis/custom_radius_dict.txt b/packaging/nsis/custom_radius_dict.txt
new file mode 100644
index 0000000000..48ecad627f
--- /dev/null
+++ b/packaging/nsis/custom_radius_dict.txt
@@ -0,0 +1,3 @@
+;Add your custom radius dictionary here
+; Example:
+;File "..\..\radius\dictionary.foo" \ No newline at end of file
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 2fa722ae5f..c38f3c6392 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -445,6 +445,7 @@ SetOutPath $INSTDIR
;
SetOutPath $INSTDIR\radius
File "..\..\radius\README.radius_dictionary"
+File "..\..\radius\custom.includes"
File "..\..\radius\dictionary"
File "..\..\radius\dictionary.3com"
File "..\..\radius\dictionary.3gpp"
@@ -588,6 +589,7 @@ File "..\..\radius\dictionary.wimax.wichorus"
File "..\..\radius\dictionary.wispr"
File "..\..\radius\dictionary.xedia"
File "..\..\radius\dictionary.zyxel"
+!include "custom_radius_dict.txt"
SetOutPath $INSTDIR
;