1 files changed, 13 insertions, 14 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7aedaafa1..01568e7fb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,12 +6,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 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, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to create Makefile.in
@@ -42,9 +42,9 @@ DVIS =
 pkgdata_DATA = FAQ
 
 # we can't add gpg.texi gpgv.texi here because automake does not like them to
-# be built files. 
+# be built files.
 
-CLEANFILES = gpg.xml gpgv.xml gpg.ru.xml 
+CLEANFILES = gpg.xml gpgv.xml gpg.ru.xml
 DISTCLEANFILES = yat2m yat2m-stamp.tmp yat2m-stamp $(myman_pages)
 
 AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css -D gpgone
@@ -92,13 +92,12 @@ dist-hook:
 	@if test "`wc -c < gpg.1`" -lt 200; then \
 	    echo 'ERROR: dummy man page'; false; fi
 
-# Helper to update some source files.
-update-source-from-gnupg-2:
-	@set -e; \
-	 if test -d ../../gnupg/scd; then dir="../../gnupg"; \
-	 else exit 1; \
-	 fi; \
-	 for i in $(sources_from_trunk); do \
-           cp $$dir/doc/$$i $$i; echo $$i; \
-	 done ;\
-	 echo "Please remember to update the ChangeLog!"
+# Copy shared files from the master branch.  We keep the texinfo files
+# all in master so that we need to modify only one source.  Macros are
+# used to customize them for a specific version.
+update-source:
+	@set -e; cd $(srcdir); \
+	 for i in $(sources_from_trunk) yat2m.c ; do \
+	   echo "updating from master:doc/$$i" >&2 ; \
+	   git show master:doc/$$i >$$i ; \
+	 done