aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/u3
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2006-09-30 12:58:52 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2006-09-30 12:58:52 +0000
commit562beb764aa61770626afb1df07d4c3017eac560 (patch)
treec2537ff9a50c4cb37cab0507e30fc01d087c5403 /packaging/u3
parentc2b08c79d299250b5b32a0d11c9f2de06def5613 (diff)
Update for latest lua changes.
svn path=/trunk/; revision=19380
Diffstat (limited to 'packaging/u3')
-rw-r--r--packaging/u3/win32/makefile.nmake9
1 files changed, 5 insertions, 4 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake
index ff5bec12cb..5bef56e873 100644
--- a/packaging/u3/win32/makefile.nmake
+++ b/packaging/u3/win32/makefile.nmake
@@ -133,9 +133,6 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe
$(COPY) $(TOPDIR)\plugins\v5ua\v5ua.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\stats_tree\stats_tree.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\plugins\mate\mate.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-!IFDEF LUA_DIR
- $(COPY) $(TOPDIR)\plugins\lua\lua.dll $(DEVICE)\plugins\$(VERSION) $(COPY_FLAGS)
-!ENDIF
$(COPY) $(TOPDIR)\radius\dictionary $(DEVICE)\radius $(COPY_FLAGS)
$(COPY) $(TOPDIR)\radius\dictionary.3com $(DEVICE)\radius $(COPY_FLAGS)
$(COPY) $(TOPDIR)\radius\dictionary.3gpp $(DEVICE)\radius $(COPY_FLAGS)
@@ -205,7 +202,7 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe
$(COPY) $(TOPDIR)\doc\wireshark.html $(DEVICE) $(COPY_FLAGS)
$(COPY) $(TOPDIR)\doc\wireshark-filter.html $(DEVICE) $(COPY_FLAGS)
!IFDEF LUA_DIR
- $(COPY) $(TOPDIR)\plugins\lua\init.lua $(DEVICE) $(COPY_FLAGS)
+ $(COPY) $(TOPDIR)\epan\wslua\init.lua $(DEVICE) $(COPY_FLAGS)
!ENDIF
# host
#
@@ -241,6 +238,10 @@ distribution: $(HOST) $(DEVICE) $(DATA) $(MANIFEST) manifest.u3i u3util.exe
$(COPY) $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(HOST) $(COPY_FLAGS)
$(COPY) $(GNUTLS_DIR)\bin\libtasn1-3.dll $(HOST) $(COPY_FLAGS)
!endif
+!ifdef LUA_DIR
+ $(COPY) $(LUA_DIR)\lib\dll\lua5.1.dll $(HOST) $(COPY_FLAGS)
+!endif
+
!IFDEF GTK2_DIR
$(COPY) $(TOPDIR)\wireshark-gtk2.exe $(HOST) $(COPY_FLAGS)
# can't get /i to work with $(COPY) above to do the rename there