Update head to match stable 1.0

1 files changed, 28 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index 4ad462f95..427d7b639 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,21 @@
+# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
 ## Process this file with automake to produce Makefile.in
 
 if CROSS_COMPILING
@@ -6,27 +24,17 @@ else
 checks = checks
 endif
 
-if COMPILE_AGENT
-agent = agent
-else
-agent = 
-endif
-
-SUBDIRS = intl zlib jnlib util g10 po tools \
-          ${agent} doc ${checks}
-EXTRA_DIST = README-alpha PROJECTS BUGS
-# gettext never gets it right, so we take here care of deleting the
-# symlink.  my_clean_gcrypt is just a kludge until we can include
-# libgcrypt.
-DISTCLEANFILES = gnupg-defs.h intl/libintl.h 
-
+SUBDIRS = intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
+EXTRA_DIST = PROJECTS BUGS config.h.in
+DISTCLEANFILES = g10defs.h 
 
 # Add all the files listed in "distfiles" files to the distribution,
-# apply version number s to some files and create a VERSION file which
+# apply version numbers to some files and create a VERSION file which
 # we need for the Prereq: patch file trick.
 dist-hook:
 	@set -e; \
-	 for file in `cd $(top_srcdir); find . -type f -name distfiles`; do \
+	 for file in `cd $(top_srcdir); \
+		     find scripts mpi include -type f -name distfiles`; do \
 	    dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \
 	    for i in distfiles `cat $(top_srcdir)/$$file` ; do \
 		ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \
@@ -36,8 +44,11 @@ dist-hook:
 	@set -e; \
 	sed -e 's/@pkg_version@/$(VERSION)/g' \
 	    $(top_srcdir)/scripts/gnupg.spec.in \
-	    > $(distdir)/scripts/gnupg.spec ; \
+	    > $(distdir)/scripts/gnupg.spec
 	echo "$(VERSION)" > $(distdir)/VERSION
 
 
 
+
+
+