base-files: fix conffiles entry check (patch from #2425)

SVN-Revision: 17618

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6995601a28c374af0d7bf39979eb8a6abd48240a..15920d52b65d84f55efa6a6797b2d396d43dfed9 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -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 \
        $(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
                                echo "$$$${conffile##$(1)}" >> $(1)/CONTROL/conffiles; \
                fi \
        done