diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-02-14 17:16:12 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-02-14 17:16:12 +0000 |
| commit | 0a11d01512db1c874c286aafa9b35a0371e744f2 (patch) | |
| tree | 87bcc9cbb938b9ecdacb038c74ab2a9dbd66e428 /packaging | |
| parent | bb1c02042cb77f03b4a28642ad32e76cf9f50d8b (diff) | |
Glib >= 2.14.5 does not require iconv
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24330 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 33ca9cdc05..e42f616701 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -150,7 +150,9 @@ $(DEST)-setup-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nm /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ !ENDIF /DGLIB_DIR=$(GLIB_DIR) \ +!IFDEF ICONV_DIR /DICONV_DIR=$(ICONV_DIR) \ +!ENDIF /DGETTEXT_DIR=$(GETTEXT_DIR) \ /DVERSION=$(VERSION) \ /DWTAP_VERSION=$(WTAP_VERSION) \ |