diff --git a/package/jimtcl/jimtcl.mk b/package/jimtcl/jimtcl.mk index c2e04ff5c5..e79e0f6951 100644 --- a/package/jimtcl/jimtcl.mk +++ b/package/jimtcl/jimtcl.mk @@ -26,16 +26,15 @@ endef endif ifeq ($(BR2_STATIC_LIBS),y) -JIMTCL_SHARED = -JIMTCL_LIB = a -JIMTCL_INSTALL_LIB = +define JIMTCL_INSTALL_LIB + $(INSTALL) -m 0644 -D $(@D)/libjim.a $(1)/usr/lib/libjim.a +endef else JIMTCL_SHARED = --shared -JIMTCL_LIB = so.$(JIMTCL_VERSION) define JIMTCL_INSTALL_LIB - $(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) \ - $(TARGET_DIR)/usr/lib/libjim.$(JIMTCL_LIB) - ln -s libjim.$(JIMTCL_LIB) $(TARGET_DIR)/usr/lib/libjim.so + $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \ + $(1)/usr/lib/libjim.$(JIMTCL_VERSION) + ln -s libjim.$(JIMTCL_VERSION) $(1)/usr/lib/libjim.so endef endif @@ -55,13 +54,12 @@ define JIMTCL_INSTALL_STAGING_CMDS for i in $(JIMTCL_HEADERS_TO_INSTALL); do \ cp -a $(@D)/$$i $(STAGING_DIR)/usr/include/ || exit 1 ; \ done; \ - $(INSTALL) -D $(@D)/libjim.$(JIMTCL_LIB) $(STAGING_DIR)/usr/lib/libjim.$(JIMTCL_LIB); - ln -s libjim.$(JIMTCL_LIB) $(STAGING_DIR)/usr/lib/libjim.so + $(call JIMTCL_INSTALL_LIB,$(STAGING_DIR)) endef define JIMTCL_INSTALL_TARGET_CMDS $(INSTALL) -D $(@D)/jimsh $(TARGET_DIR)/usr/bin/jimsh - $(JIMTCL_INSTALL_LIB) + $(call JIMTCL_INSTALL_LIB,$(TARGET_DIR)) $(JIMTCL_LINK_TCLSH) endef