diff options
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 | ||||
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 4 | ||||
| -rw-r--r-- | plugins/wimaxasncp/Makefile.am | 8 | ||||
| -rw-r--r-- | wimaxasncp/dictionary.dtd (renamed from plugins/wimaxasncp/dictionary.dtd) | 0 | ||||
| -rw-r--r-- | wimaxasncp/dictionary.xml (renamed from plugins/wimaxasncp/dictionary.xml) | 0 |
6 files changed, 17 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 5c28e95231..bd869b36ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,6 +138,7 @@ dtds_DATA = \ dtds/xcap-caps.dtd \ dtds/xcap-error.dtd \ dtds/watcherinfo.dtd + # # Install the RADIUS directory files in the "radius" subdirectory # of that directory. @@ -207,6 +208,15 @@ radius_DATA = \ radius/dictionary.wispr \ radius/dictionary.xedia +# +# Install the wimaxasncp directory files in the "wimaxasncp" subdirectory +# of that directory +# +wimaxasncpdir = $(pkgdatadir)/wimaxasncp +wimaxasncp_DATA = \ + wimaxasncp/dictionary.xml \ + wimaxasncp/dictionary.dtd + PLATFORM_SRC = capture-pcap-util-unix.c if HAVE_PLUGINS @@ -667,6 +677,7 @@ EXTRA_DIST = \ $(diameter_DATA) \ $(dtds_DATA) \ $(radius_DATA) \ + $(wimaxasncp_DATA) \ randpkt.c \ rdps.c \ smi_modules \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 7c8bd33573..9126597408 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -497,8 +497,8 @@ SetOutPath $INSTDIR ; install the wimaxasncp TLV definitions in the wimaxasncp subdirectory ; SetOutPath $INSTDIR\wimaxasncp -File "..\..\plugins\wimaxasncp\dictionary.xml" -File "..\..\plugins\wimaxasncp\dictionary.dtd" +File "..\..\wimaxasncp\dictionary.xml" +File "..\..\wimaxasncp\dictionary.dtd" SetOutPath $INSTDIR SetOutPath $INSTDIR\help diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index 19aac681a1..1a2bcc45c5 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -109,8 +109,8 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\dtds\xcap-caps.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\xcap-error.dtd $(DEVICE)\dtds $(COPY_FLAGS) $(COPY) $(TOPDIR)\dtds\watcherinfo.dtd $(DEVICE)\dtds $(COPY_FLAGS) - $(COPY) $(TOPDIR)\plugins\wimaxasncp\dictionary.xml $(DEVICE)\wimaxasncp $(COPY_FLAGS) - $(COPY) $(TOPDIR)\plugins\wimaxasncp\dictionary.dtd $(DEVICE)\wimaxasncp $(COPY_FLAGS) + $(COPY) $(TOPDIR)\wimaxasncp\dictionary.xml $(DEVICE)\wimaxasncp $(COPY_FLAGS) + $(COPY) $(TOPDIR)\wimaxasncp\dictionary.dtd $(DEVICE)\wimaxasncp $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\dumpcap.html $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\doc\editcap.html $(DEVICE) $(COPY_FLAGS) $(COPY) $(TOPDIR)\example_snmp_users_file $(DEVICE) $(COPY_FLAGS) diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index e6bfac272c..d1d926c9f2 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -128,9 +128,7 @@ EXTRA_DIST = \ Makefile.common \ Makefile.nmake \ moduleinfo.nmake \ - plugin.rc.in \ - dictionary.xml \ - dictionary.dtd + plugin.rc.in RUNLEX = $(top_srcdir)/tools/runlex.sh @@ -142,6 +140,4 @@ wimaxasncp_dict_lex.h : wimaxasncp_dict.c # wimaxasncpdir = $(pkgdatadir)/wimaxasncp -wimaxasncp_DATA = \ - dictionary.dtd \ - dictionary.xml + diff --git a/plugins/wimaxasncp/dictionary.dtd b/wimaxasncp/dictionary.dtd index 97adff9c31..97adff9c31 100644 --- a/plugins/wimaxasncp/dictionary.dtd +++ b/wimaxasncp/dictionary.dtd diff --git a/plugins/wimaxasncp/dictionary.xml b/wimaxasncp/dictionary.xml index b8b7e0c7b4..b8b7e0c7b4 100644 --- a/plugins/wimaxasncp/dictionary.xml +++ b/wimaxasncp/dictionary.xml |