[svn] GnuPG - r4728 - in trunk: . doc po tools

[svn author wk]

Author: wk
Date: 2008-03-27 14:18:19 +0100 (Thu, 27 Mar 2008)
New Revision: 4728

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/doc/ChangeLog
   trunk/doc/Makefile.am
   trunk/po/be.po
   trunk/po/ca.po
   trunk/po/cs.po
   trunk/po/da.po
   trunk/po/de.po
   trunk/po/el.po
   trunk/po/eo.po
   trunk/po/es.po
   trunk/po/et.po
   trunk/po/fi.po
   trunk/po/fr.po
   trunk/po/gl.po
   trunk/po/hu.po
   trunk/po/id.po
   trunk/po/it.po
   trunk/po/ja.po
   trunk/po/nb.po
   trunk/po/pl.po
   trunk/po/pt.po
   trunk/po/pt_BR.po
   trunk/po/ro.po
   trunk/po/ru.po
   trunk/po/sk.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/po/zh_CN.po
   trunk/po/zh_TW.po
   trunk/tools/make-dns-cert.c
Log:
Utilize new automake vars for proper installation into doc/.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-26 18:37:29 UTC (rev 4727)
+++ trunk/ChangeLog	2008-03-27 13:18:19 UTC (rev 4728)
@@ -1,3 +1,7 @@
+2008-03-27  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (dist_doc_DATA): New. Install README.
+
 2008-03-26  Werner Koch  <wk at g10code.com>
 
 	Release 2.0.9.

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2008-03-26 18:37:29 UTC (rev 4727)
+++ trunk/doc/ChangeLog	2008-03-27 13:18:19 UTC (rev 4728)
@@ -1,3 +1,9 @@
+2008-03-27  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (nobase_dist_doc_DATA, dist_html_DATA): New.  Move
+	relevant files to here.
+	(install-html-local): Remove.
+
 2008-02-27  Marcus Brinkmann  <marcus at g10code.de>
 
 	* tools.texi (Listing options): Document new types.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-03-26 18:37:29 UTC (rev 4727)
+++ trunk/Makefile.am	2008-03-27 13:18:19 UTC (rev 4728)
@@ -74,6 +74,9 @@
 SUBDIRS = m4 gl include jnlib common ${kbx} \
  ${gpg} ${keyserver} ${sm} ${agent} ${scd} ${tools} po ${doc} ${tests}
 
+dist_doc_DATA = README
+
+
 dist-hook:
 	echo "$(VERSION)" > $(distdir)/VERSION
 

Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am	2008-03-26 18:37:29 UTC (rev 4727)
+++ trunk/doc/Makefile.am	2008-03-27 13:18:19 UTC (rev 4728)
@@ -28,22 +28,27 @@
             help.pt_BR.txt help.ro.txt help.ru.txt help.sk.txt		\
             help.sv.txt help.tr.txt help.zh_CN.txt help.zh_TW.txt
 
-EXTRA_DIST = DETAILS HACKING TRANSLATE OpenPGP KEYSERVER samplekeys.asc \
+EXTRA_DIST = samplekeys.asc \
 	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png \
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \
              faq.raw FAQ faq.html gnupg7.texi \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
-	     gpgv.texi texi.css $(examples) yat2m.c
+	     gpgv.texi texi.css  yat2m.c
 
 BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
                 gnupg-card-architecture.pdf FAQ faq.html
 
 info_TEXINFOS = gnupg.texi
 
-dist_pkgdata_DATA = qualified.txt FAQ faq.html com-certs.pem \
-                    $(helpfiles)
+dist_pkgdata_DATA = qualified.txt com-certs.pem $(helpfiles)
 
+nobase_dist_doc_DATA = FAQ DETAILS HACKING TRANSLATE OpenPGP KEYSERVER \
+                       $(examples)	
+
+dist_html_DATA = faq.html 
+
+
 gnupg_TEXINFOS = \
 	gpg.texi gpgsm.texi gpg-agent.texi scdaemon.texi instguide.texi \
 	tools.texi debugging.texi glossary.texi contrib.texi gpl.texi \
@@ -140,9 +145,6 @@
 gnupg.texi : $(gnupg_TEXINFOS)
 	touch $(srcdir)/gnupg.texi
 
-install-html-local:
-	cp $(srcdir)/gnupg-logo.png gnupg.html/
-
 online: gnupg.html gnupg.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \

Modified: trunk/po/be.po  [not shown]
Modified: trunk/po/ca.po  [not shown]
Modified: trunk/po/cs.po  [not shown]
Modified: trunk/po/da.po  [not shown]
Modified: trunk/po/de.po  [not shown]
Modified: trunk/po/el.po  [not shown]
Modified: trunk/po/eo.po  [not shown]
Modified: trunk/po/es.po  [not shown]
Modified: trunk/po/et.po  [not shown]
Modified: trunk/po/fi.po  [not shown]
Modified: trunk/po/fr.po  [not shown]
Modified: trunk/po/gl.po  [not shown]
Modified: trunk/po/hu.po  [not shown]
Modified: trunk/po/id.po  [not shown]
Modified: trunk/po/it.po  [not shown]
Modified: trunk/po/ja.po  [not shown]
Modified: trunk/po/nb.po  [not shown]
Modified: trunk/po/pl.po  [not shown]
Modified: trunk/po/pt.po  [not shown]
Modified: trunk/po/pt_BR.po  [not shown]
Modified: trunk/po/ro.po  [not shown]
Modified: trunk/po/ru.po  [not shown]
Modified: trunk/po/sk.po  [not shown]
Modified: trunk/po/sv.po  [not shown]
Modified: trunk/po/tr.po  [not shown]
Modified: trunk/po/zh_CN.po  [not shown]
Modified: trunk/po/zh_TW.po  [not shown]
Modified: trunk/tools/make-dns-cert.c
===================================================================
--- trunk/tools/make-dns-cert.c	2008-03-26 18:37:29 UTC (rev 4727)
+++ trunk/tools/make-dns-cert.c	2008-03-27 13:18:19 UTC (rev 4728)
@@ -190,7 +190,7 @@
 #if defined(HAVE_CONFIG_H) && defined(VERSION)
       printf ("make-dns-cert (GnuPG) " VERSION "\n");
 #else
-      printf ("make-dns-cert gnupg-svn%s\n", "$Revision$");
+      printf ("make-dns-cert gnupg-svn%d\n", atoi (10+"$Revision$"));
 #endif
       return 0;
     }