From f426319446b5834df4715d07c23a099cd7678c3d Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Tue, 21 Jul 2009 01:12:38 +0800 Subject: [PATCH] change the default usbboot.cfg path Signed-off-by: Xiangfu Liu --- usbboot/debian/rules | 3 --- usbboot/src/Makefile.am | 9 ++++++--- usbboot/src/main.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usbboot/debian/rules b/usbboot/debian/rules index b45e25b..63c28c7 100755 --- a/usbboot/debian/rules +++ b/usbboot/debian/rules @@ -72,9 +72,6 @@ install: build # Add here commands to install the package into debian/xburst-tools. $(MAKE) DESTDIR=$(CURDIR)/debian/xburst-tools install - install -o root -g root -m 0644 doc/usbboot.cfg $(BUILDDIR)/etc/xburst-tools - - # Build architecture-independent files here. binary-indep: install # We have nothing to do by default. diff --git a/usbboot/src/Makefile.am b/usbboot/src/Makefile.am index 755a9e7..90e256a 100644 --- a/usbboot/src/Makefile.am +++ b/usbboot/src/Makefile.am @@ -13,9 +13,12 @@ usbboot_SOURCES = cmd.c command_line.c ingenic_cfg.c \ prefix = /usr datadir = /usr/share/xburst-tools data_DATA = ../xburst_stage1/xburst_stage1.bin \ - ../xburst_stage2/xburst_stage2.bin \ - usbboot.cfg -EXTRA_DIST = $(datadir) + ../xburst_stage2/xburst_stage2.bin + +cfgdir = /etc/xburst-tools +cfg_DATA = ../doc/usbboot.cfg + +EXTRA_DIST = $(datadir) $(cfgdir) ../xburst_stage1/xburst_stage1.bin: $(MAKE) CROSS_COMPILE=mipsel-openwrt-linux- -C ../xburst_stage1 diff --git a/usbboot/src/main.c b/usbboot/src/main.c index a2958ef..d34f583 100644 --- a/usbboot/src/main.c +++ b/usbboot/src/main.c @@ -26,7 +26,7 @@ #include "ingenic_usb.h" #include "ingenic_cfg.h" -#define CONFIG_FILE_PATH "/usr/share/xburst-tools/usbboot.cfg" +#define CONFIG_FILE_PATH "/etc/xburst-tools/usbboot.cfg" extern struct ingenic_dev ingenic_dev; extern struct hand hand;