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

speedo: Minor fix to the install target

Browse Source 
--
This commit is contained in:
Werner Koch 2024-01-23 09:04:10 +01:00
parent 9408c6bf51
commit b7c1594861
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -93,9 +93,9 @@
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/gnupg-foo make -f build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24
and adding the directory to PATH. and adding /usr/local/gnupg24/bin to PATH.
** Specific build problems on some machines: ** Specific build problems on some machines:

10
build-aux/speedo.mk
View File

@ -1125,13 +1125,13 @@ ifneq ($(TARGETOS),w32)
fi; \ fi; \
done; \ done; \
done; \ done; \
echo "sysconfdir = /etc" >bin/gpgconf.ctl ;\ echo "sysconfdir = /etc/gnupg" >bin/gpgconf.ctl ;\
echo "rootdir = $(idir)" >>bin/gpgconf.ctl ;\ echo "rootdir = $(idir)" >>bin/gpgconf.ctl ;\
echo "speedo: /*" ;\ echo "speedo: /*" ;\
echo "speedo: * Now copy $(idir)/ to the final location and" ;\ echo "speedo: * Now copy $(idir)/ to the final location and" ;\
echo "speedo: * adjust $(idir)/bin/gpgconf.ctl accordingly" ;\ echo "speedo: * adjust $(idir)/bin/gpgconf.ctl accordingly" ;\
echo "speedo: * Or run:" ;\ echo "speedo: * Or run:" ;\
echo "speedo: * make -f build-aux/speedo.mk install SYSROOT=/somewhere" ;\ echo "speedo: * make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24" ;\
echo "speedo: */") echo "speedo: */")
endif endif
@ -1146,7 +1146,7 @@ ifneq ($(TARGETOS),w32)
echo "speedo: ERROR: SYSROOT has not been given";\ echo "speedo: ERROR: SYSROOT has not been given";\
echo "speedo: Set SYSROOT to the desired install directory";\ echo "speedo: Set SYSROOT to the desired install directory";\
echo "speedo: Example:";\ echo "speedo: Example:";\
echo "speedo: make -f build-aux/speedo.mk install SYSROOT=/usr/local";\ echo "speedo: make -f $(topsrc)/build-aux/speedo.mk install SYSROOT=/usr/local/gnupg24";\
exit 1;\ exit 1;\
fi;\ fi;\
if [ ! -d "$$SYSROOT"/bin ]; then if ! mkdir "$$SYSROOT"/bin; then \ if [ ! -d "$$SYSROOT"/bin ]; then if ! mkdir "$$SYSROOT"/bin; then \
@ -1170,8 +1170,8 @@ ifneq ($(TARGETOS),w32)
-exec install -Dm 755 "{}" "$$SYSROOT/{}" \; ;\ -exec install -Dm 755 "{}" "$$SYSROOT/{}" \; ;\
find . -type f \! -executable \ find . -type f \! -executable \
-exec install -Dm 644 "{}" "$$SYSROOT/{}" \; ;\ -exec install -Dm 644 "{}" "$$SYSROOT/{}" \; ;\
echo "sysconfdir = /etc" > "$$SYSROOT"/bin/gpgconf.ctl ;\ echo "sysconfdir = /etc/gnupg" > "$$SYSROOT"/bin/gpgconf.ctl ;\
echo "rootdir = $$SYSROOT" >> "$$SYSROOT"/bin/gpgconf.ctl ;\ echo "rootdir = $$SYSROOT" >> "$$SYSROOT"/bin/gpgconf.ctl ;\
echo '/*' ;\ echo '/*' ;\
echo " * Installation to $$SYSROOT done" ;\ echo " * Installation to $$SYSROOT done" ;\
echo ' */' ) echo ' */' )