aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-27 05:04:29 +0000
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>2009-08-27 05:04:29 +0000
commitbf433b36ff71411eb8bd9f117f7c642138b50591 (patch)
treed6c8e3d82e1090cd1b3a70b8d29feea404989b0e /packaging
parent913335225ac696ff0465df7356ebfbf6d6cb5800 (diff)
Windows: remove all references to ICONV_DIR, because we use the statically linked win-iconv instead
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29580 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/Makefile.nmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 9ed15363fc..5fb9ee1377 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -117,9 +117,6 @@ wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(
/DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \
/DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \
/DGLIB_DIR=$(GLIB_DIR) \
-!IFDEF ICONV_DIR
- /DICONV_DIR=$(ICONV_DIR) \
-!ENDIF
/DGETTEXT_DIR=$(GETTEXT_DIR) \
/DGETTEXT_DLL=$(GETTEXT_DLL) \
/DVERSION=$(VERSION) \