aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-12-12 01:29:13 +0000
committerGuy Harris <guy@alum.mit.edu>2001-12-12 01:29:13 +0000
commit39362af8144a3c9645cf35907c8d59d795019e79 (patch)
treeacabd038f5dae5885a9319a919bc0bbe140d62d7 /packaging
parentc5b1e310e332942052e44b40263f2621d9c7a6a3 (diff)
From Motonori Shindo:
fix a bogus batch mode inference rule of make, so that "vc60.pdb" files are created in the proper directory; delete ".pdb" files in a "nmake -f Makefile.nmake clean"; include the text2pcap and mergecap ".pdb" files in the Windows binary distribution. svn path=/trunk/; revision=4385
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake5
-rw-r--r--packaging/nsis/ethereal.nsi.in4
2 files changed, 6 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 98eaa49ae8..1dcfc50528 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.7 2001/07/12 22:45:23 gram Exp $
+# $Id: Makefile.nmake,v 1.8 2001/12/12 01:29:07 guy Exp $
#
#
# NSIS is a free packager/installer/uninstaller program for Win32.
@@ -12,7 +12,8 @@ include ../../config.nmake
EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \
../../text2pcap.exe ../../mergecap.exe
-PDB=../../ethereal.pdb ../../tethereal.pdb ../../editcap.pdb
+PDB=../../ethereal.pdb ../../tethereal.pdb ../../editcap.pdb \
+ ../../text2pcap.pdb ../../mergecap.pdb
DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll
DOC=../../doc/ethereal.html \
../../doc/tethereal.html \
diff --git a/packaging/nsis/ethereal.nsi.in b/packaging/nsis/ethereal.nsi.in
index 7f2870c51f..616cdc42a1 100644
--- a/packaging/nsis/ethereal.nsi.in
+++ b/packaging/nsis/ethereal.nsi.in
@@ -1,7 +1,7 @@
;
; ethereal.nsi
;
-; $Id: ethereal.nsi.in,v 1.8 2001/11/01 21:55:08 guy Exp $
+; $Id: ethereal.nsi.in,v 1.9 2001/12/12 01:29:07 guy Exp $
; ============================================================================
; Header configuration
@@ -128,6 +128,8 @@ SetOutPath $INSTDIR
File "..\..\ethereal.pdb"
File "..\..\tethereal.pdb"
File "..\..\editcap.pdb"
+File "..\..\mergecap.pdb"
+File "..\..\text2pcap.pdb"
SectionEnd
SectionDivider