diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:29:28 +0100 |
| commit | 39aef29414d77492e06d872cfeaf4ba744fa9d38 (patch) | |
| tree | 708ee5f6f46f5bd2db6c4ec1cce2a1922df4076a /package/gdb/Makefile | |
| parent | ed3d91cf2dfc6f63ae749b54c7d718eb73dd6211 (diff) | |
| parent | 6e58f05aaae4943de494bc30dd3bf184a6d676f2 (diff) | |
resolve conflict
Diffstat (limited to 'package/gdb/Makefile')
| -rw-r--r-- | package/gdb/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/gdb/Makefile b/package/gdb/Makefile index 8128e8bd5..d8b9a26bd 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -36,13 +36,13 @@ XAKE_FLAGS+= LDFLAGS='${TARGET_LDFLAGS}' XAKE_FLAGS+= GCC_HONOUR_COPTS:=s post-extract: - -mv $(STAGING_DIR)/usr/lib/libiberty.a $(STAGING_DIR)/usr/lib/libiberty.a.bak + -mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak gdb-install: ${INSTALL_DIR} ${IDIR_GDB}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/ # shipped libbfd conflicts with system wide one rm -f ${WRKINST}/usr/lib/libbfd* - -mv $(STAGING_DIR)/usr/lib/libiberty.a.bak $(STAGING_DIR)/usr/lib/libiberty.a + -mv $(STAGING_TARGET_DIR)/usr/lib/libiberty.a.bak $(STAGING_TARGET_DIR)/usr/lib/libiberty.a include ${TOPDIR}/mk/pkg-bottom.mk |