On Wed, May 21, 2008 at 4:53 AM, Patrick Scharrenberg <[EMAIL PROTECTED]>
wrote:

> - corrected inclusion of Package/vim/Default
> - removed unused Package/vim-full/conffiles and Package/vim/conffiles
> - removed unused/broken Package/vim-full/postinst and Package/vim/postinst
>  which tried to modify files on the build-host!!
>
> Signed-off-by: Patrick Scharrenberg <[EMAIL PROTECTED]>
> ---
> Index: utils/vim/Makefile
> ===================================================================
> --- utils/vim/Makefile  (revision 11231)
> +++ utils/vim/Makefile  (working copy)
> @@ -30,33 +30,25 @@
>  endef
>
>  define Package/vim
> -  $(call Packages/vim/Default)
> +  $(call Package/vim/Default)
>   TITLE+= (Tiny)
>  endef
>
>  define Package/vim-full
> -  $(call Packages/vim/Default)
> +  $(call Package/vim/Default)
>   TITLE+= (Normal)
>  endef
>
>  define Package/vim-runtime
> -  $(call Packages/vim/Default)
> +  $(call Package/vim/Default)
>   TITLE+= (runtime files)
>  endef
>
>  define Package/vim-help
> -  $(call Packages/vim/Default)
> +  $(call Package/vim/Default)
>   TITLE+= (help files)
>  endef
>
> -define Package/vim-full/conffiles
> -/usr/share/vim/vimrc
> -endef
> -
> -define Package/vim/conffiles
> -/usr/share/vim/vimrc
> -endef
> -
>  define Package/vim/description
>        Vim is an almost compatible version of the UNIX editor Vi.
>        (Tiny build)
> @@ -155,28 +147,7 @@
>        tar -C $(1) -xzf $(PKG_BUILD_DIR)/docs.tgz
>  endef
>
> -define Package/vim-full/postinst
> -#!/bin/sh
> -  if [ $${IPKG_INSTROOT} != / ]
> -  then
> -    if [ -d /usr/share/ ]
> -      then
> -        ln -s $${IPKG_INSTROOT}/usr/share/vim/ /usr/share/
> -    fi
> -  fi
> -endef
>
> -define Package/vim/postinst
> -#!/bin/sh
> -  if [ $${IPKG_INSTROOT} != / ]
> -  then
> -    if [ -d /usr/share/ ]
> -      then
> -        ln -s $${IPKG_INSTROOT}/usr/share/vim/vimrc /usr/share/vim/vimrc
> -    fi
> -  fi
> -endef
> -
>  $(eval $(call BuildPackage,vim))
>  $(eval $(call BuildPackage,vim-full))
>  $(eval $(call BuildPackage,vim-runtime))
> _______________________________________________
> openwrt-devel mailing list
> [email protected]
> http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>

I committed parts 1 and 3 in r11234. The conffiles part should be there.

Travis
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to