diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-15 06:01:45 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-15 06:01:45 +0000 |
| commit | bcd27e686ea1080b8cf67ccd37220f5a227bb90f (patch) | |
| tree | f6de61d9e99d66e36e0086a0d7929332ec55f0f4 | |
| parent | d083ae299addb352a3fb50651bd298870ebdd2f3 (diff) | |
package/base-files: use a single $(CP) instead of two to copy shared library files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20874 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b4942d938..07c1089e8 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -414,11 +414,15 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/glibc/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/ld*.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so $(1)/lib/ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/ld*.so.* \ + $(CP) $(TOOLCHAIN_DIR)/lib/ld-$(LIBC_SO_VERSION).so \ + $(1)/lib/ for file in libanl libc libcidn libcrypt libdl libm $(use_libnsl) $(use_nsswitch) libresolv $(use_libutil); do \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/$$$$file.so.* \ + $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \ + $(1)/lib/; \ done endef @@ -429,8 +433,10 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/uClibc/install $(INSTALL_DIR) $(1)/lib for file in ld$(LIB_SUFFIX)-uClibc libc libcrypt libdl libm libnsl libresolv libuClibc libutil; do \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file.so.* $(1)/lib/; \ - $(CP) $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so $(1)/lib/; \ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/$$$$file.so.* \ + $(TOOLCHAIN_DIR)/lib/$$$$file-$(LIBC_SO_VERSION).so \ + $(1)/lib/; \ done endef @@ -449,8 +455,10 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/libpthread/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/libpthread.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so $(1)/lib/ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/libpthread.so.* \ + $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \ + $(1)/lib/ endef define Package/libpthread/install_lib @@ -459,8 +467,10 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/librt/install $(INSTALL_DIR) $(1)/lib - $(CP) $(TOOLCHAIN_DIR)/lib/librt.so.* $(1)/lib/ - $(CP) $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so $(1)/lib/ + $(CP) \ + $(TOOLCHAIN_DIR)/lib/librt.so.* \ + $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \ + $(1)/lib/ endef define Package/ldd/install |