diff options
author | Xiaolong Jiang <xiaolongx.jiang@intel.com> | 2020-09-23 09:29:24 +0800 |
---|---|---|
committer | Xiaolong Jiang <xiaolongx.jiang@intel.com> | 2020-11-03 14:53:04 +0800 |
commit | 26f546256d5f9c981224b30f6b9988941d76d018 (patch) | |
tree | 65623bab67a135bc3f50d8406c1e4725bdc128e0 /packages/nginx_ldp.mk | |
parent | 20e5bc31904d25e44cda5ef675d4ab1e86795bdb (diff) |
modify vcl patch and remove ldp-lock patch
Signed-off-by: Xiaolong Jiang <xiaolongx.jiang@intel.com>
Change-Id: I4fe5f4dc2121d952bd0a4394afe0b18ce6f93516
Diffstat (limited to 'packages/nginx_ldp.mk')
-rw-r--r-- | packages/nginx_ldp.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/packages/nginx_ldp.mk b/packages/nginx_ldp.mk index f7756de..db9386a 100644 --- a/packages/nginx_ldp.mk +++ b/packages/nginx_ldp.mk @@ -41,14 +41,15 @@ endef define nginx_ldp_build_cmds @$(MAKE) -C $(nginx_ldp_src_dir) + @$(MAKE) -C $(nginx_ldp_src_dir) DESTDIR=$(B) install + @cp configs/mime.types $(B)$(nginx_ldp_install_dir)/conf/. + @cp configs/nginx.conf $(B)$(nginx_ldp_install_dir)/conf/. + @cp configs/tls-* $(B)$(nginx_ldp_install_dir)/conf/. + @cp configs/vcl.conf $(B)$(nginx_ldp_install_dir)/conf/. endef define nginx_ldp_install_cmds - @$(MAKE) -C $(nginx_ldp_src_dir) install - @cp configs/mime.types $(nginx_ldp_install_dir)/conf/. - @cp configs/nginx.conf $(nginx_ldp_install_dir)/conf/. - @cp configs/tls-* $(nginx_ldp_install_dir)/conf/. - @cp configs/vcl.conf $(nginx_ldp_install_dir)/conf/. + @true endef define nginx_ldp_pkg_deb_cmds @@ -56,7 +57,7 @@ define nginx_ldp_pkg_deb_cmds -t deb \ -n $(nginx_ldp_pkg_deb_name) \ -v $(nginx_ldp_version) \ - -C $(nginx_ldp_install_dir) \ + -C $(B)$(nginx_ldp_install_dir) \ -p $(nginx_ldp_pkg_deb_dir) \ --prefix $(nginx_ldp_deb_inst_dir) \ --license $(LICENSE) \ |