security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-21 10:09:57 +01:00
Code Activity

build: Prepare docs for GnuPG 2.6

Browse Source 
--
This commit is contained in:
Werner Koch 2024-07-05 12:09:23 +02:00
parent 6a40cfa6c0
commit 7c4c35f542
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -163,7 +163,7 @@ dist-hook: gen-ChangeLog
distcheck-hook: distcheck-hook:
set -e; ( \ set -e; ( \
pref="#+macro: gnupg24_" ;\ pref="#+macro: gnupg26_" ;\
reldate="$$(date -u +%Y-%m-%d)" ;\ reldate="$$(date -u +%Y-%m-%d)" ;\
echo "$${pref}ver $(PACKAGE_VERSION)" ;\ echo "$${pref}ver $(PACKAGE_VERSION)" ;\
echo "$${pref}date $${reldate}" ;\ echo "$${pref}date $${reldate}" ;\
@ -312,7 +312,7 @@ sign-release:
gpg -sbu $$mysignkey $${wixlibfile} ;\ gpg -sbu $$mysignkey $${wixlibfile} ;\
fi; \ fi; \
cat $(RELEASE_NAME).swdb >swdb.snippet;\ cat $(RELEASE_NAME).swdb >swdb.snippet;\
echo '#+macro: gnupg24_branch STABLE-BRANCH-2-4' >>swdb.snippet;\ echo '#+macro: gnupg26_branch master' >>swdb.snippet;\
cat $${release_w32_name}.exe.swdb >>swdb.snippet;\ cat $${release_w32_name}.exe.swdb >>swdb.snippet;\
echo >>swdb.snippet ;\ echo >>swdb.snippet ;\
sha1sum $${files1} >>swdb.snippet ;\ sha1sum $${files1} >>swdb.snippet ;\

11
README
View File

@ -25,9 +25,12 @@
can be freely used, modified and distributed under the terms of the can be freely used, modified and distributed under the terms of the
GNU General Public License. GNU General Public License.
Note that versions 2.5.x are maintained development versions leading
to the forthcoming new stable version 2.6.x.
* BUILD INSTRUCTIONS * BUILD INSTRUCTIONS
GnuPG 2.4 depends on the following GnuPG related packages: GnuPG 2.6 depends on the following GnuPG related packages:
npth (https://gnupg.org/ftp/gcrypt/npth/) npth (https://gnupg.org/ftp/gcrypt/npth/)
libgpg-error (https://gnupg.org/ftp/gcrypt/libgpg-error/) libgpg-error (https://gnupg.org/ftp/gcrypt/libgpg-error/)
@ -93,10 +96,10 @@
libraries can be installed into an arbitrary location using for libraries can be installed into an arbitrary location using for
example: example:
make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24 make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg26
ldconfig -n /usr/local/gnupg24/lib ldconfig -n /usr/local/gnupg26/lib
and adding /usr/local/gnupg24/bin to PATH. and adding /usr/local/gnupg26/bin to PATH.
** Specific build problems on some machines: ** Specific build problems on some machines:

2
doc/Makefile.am
View File

@ -74,7 +74,7 @@ DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
YAT2M_OPTIONS = -I $(srcdir) \ YAT2M_OPTIONS = -I $(srcdir) \
--release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.4" --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard 2.6"
myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \ myman_sources = gnupg7.texi gpg.texi gpgsm.texi gpg-agent.texi \
dirmngr.texi scdaemon.texi tools.texi wks.texi \ dirmngr.texi scdaemon.texi tools.texi wks.texi \