aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--diameter/Custom.make6
-rw-r--r--diameter/Custom.xml4
-rw-r--r--packaging/nsis/Makefile.am1
-rw-r--r--packaging/nsis/custom_diameter_xmls.txt4
-rw-r--r--packaging/nsis/wireshark.nsi1
6 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 6e17246086..f9a9e5aab2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,8 @@ nobase_dist_profiles_DATA = \
# of that directory.
#
diameterdir = $(pkgdatadir)/diameter
-dist_diameter_DATA = \
+include diameter/Custom.make
+dist_diameter_DATA = $(_CUSTOM_diameter_xml_files_) \
diameter/chargecontrol.xml \
diameter/ChinaTelecom.xml \
diameter/Cisco.xml \
diff --git a/diameter/Custom.make b/diameter/Custom.make
new file mode 100644
index 0000000000..abd28aa5e4
--- /dev/null
+++ b/diameter/Custom.make
@@ -0,0 +1,6 @@
+# $Id$
+# Add custom dictionaries here as:
+# diameter/foo.xml
+#
+
+_CUSTOM_diameter_xml_files_ = \ No newline at end of file
diff --git a/diameter/Custom.xml b/diameter/Custom.xml
index 7b672c0e05..646821bb13 100644
--- a/diameter/Custom.xml
+++ b/diameter/Custom.xml
@@ -2,8 +2,8 @@
<!-- $Id$ -->
<!DOCTYPE dictionary SYSTEM "dictionary.dtd" [
- <!-- Any files added here need to be added to Makefile.am and
- packaging/nsis/wireshark.nsi if you want them to be distributed
+ <!-- Any files added here need to be added to Custom.make and
+ packaging/nsis/custom_diameter_xmls.txt if you want them to be distributed
-->
<!-- create entities like this:
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index c8549ca328..c5e8509cba 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
WinPcapPage.ini \
Makefile.nmake \
Custom.nmake \
+ custom_diameter_xmls.txt \
custom_plugins.txt \
custom_mibs.txt \
custom_radius_dict.txt \
diff --git a/packaging/nsis/custom_diameter_xmls.txt b/packaging/nsis/custom_diameter_xmls.txt
new file mode 100644
index 0000000000..d4c0c38a77
--- /dev/null
+++ b/packaging/nsis/custom_diameter_xmls.txt
@@ -0,0 +1,4 @@
+; $Id$
+;Add your custom diameter dictionary here
+; Example:
+;File "..\..\diameter\foo.xml"
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index e32b782a4a..69fdec9219 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -442,6 +442,7 @@ File "..\..\diameter\TGPPS9.xml"
File "..\..\diameter\TGPPSh.xml"
File "..\..\diameter\VerizonWireless.xml"
File "..\..\diameter\Vodafone.xml"
+!include "custom_diameter_xmls.txt"
SetOutPath $INSTDIR
;