[Astlinux-commits] SF.net SVN: astlinux: [1473] trunk/package

[<kr...@us...>]

Revision: 1473
          http://astlinux.svn.sourceforge.net/astlinux/?rev=1473&view=rev
Author:   krisk84
Date:     2008-01-02 08:14:37 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
make sure busybox vi and vim don't clash

Modified Paths:
--------------
    trunk/package/busybox/busybox.mk
    trunk/package/config/conf
    trunk/package/config/mconf

Modified: trunk/package/busybox/busybox.mk
===================================================================
--- trunk/package/busybox/busybox.mk	2008-01-02 16:07:33 UTC (rev 1472)
+++ trunk/package/busybox/busybox.mk	2008-01-02 16:14:37 UTC (rev 1473)
@@ -68,6 +68,9 @@
 	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
 	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
 endif
+ifeq ($(strip $(BR2_PACKAGE_VIM)),y)
+	$(SED) "s/^.*CONFIG_VI.*/CONFIG_VI=n/" $(BUSYBOX_DIR)/.config
+endif
 	yes "" | $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
 	touch $@

Modified: trunk/package/config/conf
===================================================================
(Binary files differ)

Modified: trunk/package/config/mconf
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.