aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-07-19 08:02:50 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-07-19 08:02:50 +0000
commit78527f225db21d9bc65c959bcc5ad2947a7f6336 (patch)
treee709d72acf9f44cd3c006c1edf30fa1f32037d68
parent41be8e4344cb6f8b7db491a954b9f083b9ebd69e (diff)
Make it possible to add custom/private MIBs to the Windows installer.
svn path=/trunk/; revision=43819
-rw-r--r--packaging/nsis/Makefile.am1
-rw-r--r--packaging/nsis/custom_mibs.txt5
-rw-r--r--packaging/nsis/wireshark.nsi1
3 files changed, 7 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index 4669934aad..3615d4e96f 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -16,4 +16,5 @@ EXTRA_DIST = \
Makefile.nmake \
Custom.nmake \
custom_plugins.txt \
+ custom_mibs.txt \
x64.nsh
diff --git a/packaging/nsis/custom_mibs.txt b/packaging/nsis/custom_mibs.txt
new file mode 100644
index 0000000000..bca7084aee
--- /dev/null
+++ b/packaging/nsis/custom_mibs.txt
@@ -0,0 +1,5 @@
+; $Id$
+; Add your custom SNMP MIBS directives here
+; Example:
+; Point to the dir of the MIBS
+;File "mymibdirpath\mibs\*"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index fc04d4e1cc..754bcb6d65 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -842,6 +842,7 @@ File "${SMI_DIR}\share\mibs\irtf\*"
File "${SMI_DIR}\share\mibs\tubs\*"
File "${SMI_DIR}\share\pibs\*"
File "${SMI_DIR}\share\yang\*.yang"
+!include "custom_mibs.txt"
SectionEnd
!endif