diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:41:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:41:36 +0100 |
| commit | 0aabef127155575e8c8d660605f9401ab15356aa (patch) | |
| tree | b8cd5f06c60cd4e95fd7a2923dabb3b831dd93b3 /mk/pkg-bottom.mk | |
| parent | 0b09c2710166bd95ac9033b048bb6cbf7b4de7c2 (diff) | |
allow native build of a lot of packages
STAGING_TARGET_DIR is used for package Makefile's for
include and library search path's. STAGING_DIR is used
for common code in mk/ or Makefile/rules.mk.
STAGING_TARGET_DIR is /usr when native builds are used.
Diffstat (limited to 'mk/pkg-bottom.mk')
| -rw-r--r-- | mk/pkg-bottom.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index f91e1bb45..436a0cbee 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -130,7 +130,7 @@ post-install: spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} -rm -f ${_ALL_CONTROLS} - @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_TARGET_DIR}/scripts' + @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_DIR}/scripts' @mkdir -p ${WRKINST}/{sbin,bin,etc,lib} ${WRKINST}/usr/{sbin,bin,lib} @${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE) @env ${MAKE_ENV} ${MAKE} pre-install $(MAKE_TRACE) @@ -155,7 +155,7 @@ ifeq ($(ADK_NATIVE),) endif ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ - cd '${STAGING_TARGET_DIR}'; \ + cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ done <'${STAGING_PKG_DIR}/${PKG_NAME}'; \ @@ -170,14 +170,14 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ - $(TOOLS_DIR)/cpio -padlmu '${STAGING_TARGET_DIR}' - @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \ + $(TOOLS_DIR)/cpio -padlmu '${STAGING_DIR}' + @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \ chmod u+w $$fn; \ $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$fn; \ done ifeq (,$(filter noscripts,${PKG_OPTS})) - @cd '${STAGING_TARGET_DIR}'; grep 'usr/s*bin/' \ + @cd '${STAGING_DIR}'; grep 'usr/s*bin/' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | \ while read fn; do \ b="$$(dd if="$$fn" bs=2 count=1 2>/dev/null)"; \ @@ -240,7 +240,7 @@ clean-targets: clean-dev-generic clean-dev-generic: ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PKG_DIR}/${PKG_NAME}'; then \ - cd '${STAGING_TARGET_DIR}'; \ + cd '${STAGING_DIR}'; \ while read fn; do \ rm -f "$$fn"; \ done <'${STAGING_PKG_DIR}/${PKG_NAME}'; \ |