X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/dc91a5dceffb09f6c42a0cef03ace32c8b02d8e6..2d32ced1744d54bae589cb1500e1453cfa84a8ca:/package/base-files/Makefile

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e6cbb2161..15920d52b 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=26
+PKG_RELEASE:=31
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
@@ -194,7 +194,7 @@ define Package/base-files/install
 	$(call Package/base-files/install-target,$(1))
 	for conffile in $(1)/etc/config/*; do \
 		if [ -f "$$$$conffile" ]; then \
-			grep "$$$$conffile" $(1)/CONTROL/conffiles || \
+			grep "$$$${conffile##$(1)}" $(1)/CONTROL/conffiles || \
 				echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
 		fi \
 	done
@@ -247,6 +247,7 @@ endef
 
 define Package/libc/install_lib
 	$(CP) $(filter-out %/libdl_pic.a,$(wildcard $(TOOLCHAIN_DIR)/usr/lib/lib*.a)) $(1)/lib/
+	$(if $(wildcard $(TOOLCHAIN_DIR)/usr/lib/libc_so.a),$(CP) $(TOOLCHAIN_DIR)/usr/lib/libc_so.a $(1)/lib/libc_pic.a)
 	$(CP) $(TOOLCHAIN_DIR)/usr/lib/gcc/*/*/libgcc.a $(1)/lib/libgcc_s_pic.a
 endef