1*4882a593SmuzhiyunFrom 0b80e8beff68a0570fdc2d9281992060414475c1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Romain Naour <romain.naour@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 29 Apr 2017 22:13:54 +0200 4*4882a593SmuzhiyunSubject: [PATCH] allow to install to a specific location using DESTDIR 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunDESTDIR is the autotools standard variable where to copy 7*4882a593Smuzhiyunheaders, libraries and binaries. It's not the same as "prefix". 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSo while installing to Buildroot STAGING directory, use prefix=/usr 10*4882a593Smuzhiyunand DESTOR=$(STAGING_DIR). 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Romain Naour <romain.naour@gmail.com> 13*4882a593SmuzhiyunSigend-off-by: Corentin GUILLEVIC <corentin.guillevic@smile.fr> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun include/Makefile | 12 ++++++------ 16*4882a593Smuzhiyun src/Makefile | 10 +++++----- 17*4882a593Smuzhiyun 2 files changed, 11 insertions(+), 11 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/include/Makefile b/include/Makefile 20*4882a593Smuzhiyunindex 26a8139..a8cf369 100644 21*4882a593Smuzhiyun--- a/include/Makefile 22*4882a593Smuzhiyun+++ b/include/Makefile 23*4882a593Smuzhiyun@@ -2,10 +2,10 @@ include ../Makefile.common 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun .PHONY: install 26*4882a593Smuzhiyun install: 27*4882a593Smuzhiyun- mkdir -p $(prefix)/include/loki 28*4882a593Smuzhiyun- mkdir -p $(prefix)/include/loki/flex 29*4882a593Smuzhiyun- mkdir -p $(prefix)/include/loki/yasli 30*4882a593Smuzhiyun+ mkdir -p $(DESTDIR)$(prefix)/include/loki 31*4882a593Smuzhiyun+ mkdir -p $(DESTDIR)$(prefix)/include/loki/flex 32*4882a593Smuzhiyun+ mkdir -p $(DESTDIR)$(prefix)/include/loki/yasli 33*4882a593Smuzhiyun 34*4882a593Smuzhiyun- install -m 644 loki/*.h $(prefix)/include/loki 35*4882a593Smuzhiyun- install -m 644 loki/flex/*.h $(prefix)/include/loki/flex 36*4882a593Smuzhiyun- install -m 644 loki/yasli/*.h $(prefix)/include/loki/yasli 37*4882a593Smuzhiyun+ install -m 644 loki/*.h $(DESTDIR)$(prefix)/include/loki 38*4882a593Smuzhiyun+ install -m 644 loki/flex/*.h $(DESTDIR)$(prefix)/include/loki/flex 39*4882a593Smuzhiyun+ install -m 644 loki/yasli/*.h $(DESTDIR)$(prefix)/include/loki/yasli 40*4882a593Smuzhiyundiff --git a/src/Makefile b/src/Makefile 41*4882a593Smuzhiyunindex b272929..054285e 100644 42*4882a593Smuzhiyun--- a/src/Makefile 43*4882a593Smuzhiyun+++ b/src/Makefile 44*4882a593Smuzhiyun@@ -74,13 +74,13 @@ INSTALL_DATA := $(INSTALL) -m 644 45*4882a593Smuzhiyun install: install-static install-shared 46*4882a593Smuzhiyun 47*4882a593Smuzhiyun install-static: $(RESULT_DIR)$(STATIC_LIB) 48*4882a593Smuzhiyun- mkdir -p $(prefix)/lib 49*4882a593Smuzhiyun- $(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(prefix)/lib 50*4882a593Smuzhiyun+ mkdir -p $(DESTDIR)$(prefix)/lib 51*4882a593Smuzhiyun+ $(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(DESTDIR)$(prefix)/lib 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun install-shared: $(RESULT_DIR)$(SHARED_LIB_VERSIONED) 54*4882a593Smuzhiyun- mkdir -p $(prefix)/lib 55*4882a593Smuzhiyun- $(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(prefix)/lib 56*4882a593Smuzhiyun- cd $(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE) 57*4882a593Smuzhiyun+ mkdir -p $(DESTDIR)$(prefix)/lib 58*4882a593Smuzhiyun+ $(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(DESTDIR)$(prefix)/lib 59*4882a593Smuzhiyun+ cd $(DESTDIR)$(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE) 60*4882a593Smuzhiyun 61*4882a593Smuzhiyun %.lo : %.cpp 62*4882a593Smuzhiyun $(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $< 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun2.9.3 65*4882a593Smuzhiyun 66