diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-23 01:39:07 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-23 01:39:07 +0000 |
| commit | 86a361ea806d3a86f624d8404a6edbc8a98b40c1 (patch) | |
| tree | e7f188c38944daa524432924fb44dfac3af5a2aa /doc/Makefile.nmake | |
| parent | 371775055d3aa77e3c9717f0b6bf74093f1b2c3d (diff) | |
change the Win32 build environment, so we can create release zip files without the need of an installer - a feature requested from time to time. When this is matured, we might want to add these zip files (of GTK1 and GTK2 versions) to the released files.
config.nmake contains the target INSTALL1_DIR and INSTALL2_DIR. I guess you can retain the previous behaviour by using . for both DIRs, though I never tested this...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19302 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'doc/Makefile.nmake')
| -rw-r--r-- | doc/Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake index 3006598d9f..ee8f64207c 100644 --- a/doc/Makefile.nmake +++ b/doc/Makefile.nmake @@ -52,7 +52,7 @@ wireshark.html: wireshark-tmp.pod ../config.h --noindex \ wireshark-tmp.pod > wireshark.html -../tshark.exe: +../$(INSTALL2_DIR)/tshark.exe: cd .. $(MAKE) -f makefile.nmake tshark.exe cd doc @@ -81,10 +81,10 @@ wireshark-filter.html: wireshark-filter.pod ../config.h --noindex \ wireshark-filter.pod > wireshark-filter.html -wireshark-filter.pod: wireshark-filter.pod.template ../tshark.exe +wireshark-filter.pod: wireshark-filter.pod.template ../$(INSTALL2_DIR)/tshark.exe cd .. $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-deps - tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod + $(INSTALL2_DIR)\tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps cd doc |