Fixups after replacement of ethereal.nsi.in by ethereal.nsi

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6024 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/nsis/.cvsignore b/packaging/nsis/.cvsignore
index a3033308f06d05738debdf02b0232a1631e07eac..8622ad496bf86435abcd0bc129436e5df7bd3078 100644 (file)
--- a/packaging/nsis/.cvsignore
+++ b/packaging/nsis/.cvsignore
@@ -1,4 +1,3 @@
 Makefile.in
 Makefile
-ethereal.nsi
 *.exe

diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index f9707ffc3818c892f786bb5679f4d2cbf1ea854a..1e2128b5fbdecf42bb987cb510c9af66004c666c 100644 (file)
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = \
-       ethereal.nsi.in \
+       ethereal.nsi    \
        GPL.txt         \
        Makefile.nmake