From 841a797f6d45065aa77128fdfd43bd4769efefa4 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 3 Oct 2014 15:30:38 +0200 Subject: [PATCH] speedo: Add INSTALL_PREFIX feature. -- With this it is now possible build and install gnupg 2.1 properly below /usr/local: make -f TOPSRC/build-aux/speed.ml native INSTALL_PREFIX=/usr/local Of course you need installation priviliges for the /usr/local tree. --- build-aux/speedo.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index a9ba6d4c7..6d344f1bf 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -58,8 +58,10 @@ help: @echo ' w32-installer Build a Windows installer' @echo ' w32-source Pack a source archive' @echo - @echo 'Prepend TARGET with "git-" to build from GIT repos' - @echo 'Prepend TARGET with "this-" to build from the source tarball' + @echo 'You may append INSTALL_REFIX= for native builds.' + @echo 'Prepend TARGET with "git-" to build from GIT repos.' + @echo 'Prepend TARGET with "this-" to build from the source tarball.' + SPEEDOMAKE := $(MAKE) -f $(SPEEDO_MK) UPD_SWDB=1 @@ -124,6 +126,9 @@ MAKE_J=3 # Name to use for the w32 installer and sources INST_NAME=gnupg-w32 +# Use this to override the installaion directory for native builds. +INSTALL_PREFIX=none + # Directory names. # They must be absolute, as we switch directories pretty often. @@ -131,7 +136,11 @@ root := $(shell pwd)/PLAY sdir := $(root)/src bdir := $(root)/build bdir6:= $(root)/build-w64 +ifeq ($(INSTALL_PREFIX),none) idir := $(root)/inst +else +idir := $(abspath $(INSTALL_PREFIX)) +endif idir6:= $(root)/inst-w64 stampdir := $(root)/stamps topsrc := $(shell cd $(dir $(SPEEDO_MK)).. && pwd)