0001-allow-to-install-to-a-specific-location-using-DESTDI.patch 2.4 KB

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