summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorGilbert Ramirez <gram@alumni.rice.edu>2001-04-04 20:08:16 +0000
committerGilbert Ramirez <gram@alumni.rice.edu>2001-04-04 20:08:16 +0000
commitfa924d4380ccf5d782c1cdd85372e87fbbbe1bf2 (patch)
tree5a664b9a66d341285a3465c6c52e7c075b6ac5c8 /packaging
parente03cc2278c228fad8719d6956835206375a2ac28 (diff)
downloadwireshark-fa924d4380ccf5d782c1cdd85372e87fbbbe1bf2.tar.gz
Move the comments in nsis/README into nsis/Makefile.nmake
Have automake package the nsis files into the source tarball. svn path=/trunk/; revision=3256
Diffstat (limited to 'packaging')
-rw-r--r--packaging/Makefile.am2
-rw-r--r--packaging/nsis/.cvsignore3
-rw-r--r--packaging/nsis/Makefile.am4
-rw-r--r--packaging/nsis/Makefile.nmake8
-rw-r--r--packaging/nsis/README7
5 files changed, 15 insertions, 9 deletions
diff --git a/packaging/Makefile.am b/packaging/Makefile.am
index 5e584cc9b0..c4f367f9bc 100644
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@@ -1 +1 @@
-SUBDIRS = rpm svr4
+SUBDIRS = rpm svr4 nsis
diff --git a/packaging/nsis/.cvsignore b/packaging/nsis/.cvsignore
new file mode 100644
index 0000000000..8622ad496b
--- /dev/null
+++ b/packaging/nsis/.cvsignore
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+*.exe
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
new file mode 100644
index 0000000000..1e2128b5fb
--- /dev/null
+++ b/packaging/nsis/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = \
+ ethereal.nsi \
+ GPL.txt \
+ Makefile.nmake
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index b042924711..252fb8dce4 100644
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,6 +1,12 @@
#
-# $Id: Makefile.nmake,v 1.1 2001/04/04 04:50:05 gram Exp $
+# $Id: Makefile.nmake,v 1.2 2001/04/04 20:08:16 gram Exp $
#
+#
+# NSIS is a free packager/installer/uninstaller program for Win32.
+# It was originally written for the Winamp package, but various
+# freeware and non-freeware packages are using it, too.
+#
+# http://www.nullsoft.com/free/nsis/
include ../../config.nmake
diff --git a/packaging/nsis/README b/packaging/nsis/README
deleted file mode 100644
index 85e8657822..0000000000
--- a/packaging/nsis/README
+++ /dev/null
@@ -1,7 +0,0 @@
-$Id: README,v 1.1 2001/04/04 04:50:05 gram Exp $
-
-http://www.nullsoft.com/free/nsis/
-
-NSIS is a free packager/installer/uninstaller program for Win32.
-It was originally written for the Winamp package, but various
-freeware and non-freeware packages are using it, too.