qi-hardware/xburst-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/xburst-tools.git synced 2024-11-25 20:55:01 +02:00
Code

[usbboot] use autoconf datadir not static path

Browse Source
This commit is contained in:
Xiangfu Liu 2010-02-25 13:13:58 +08:00
parent bf8a822136
commit d8105c6d2e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usbboot/src/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = -pedantic -Wall -W -O1 -g3 -std=gnu99 -lusb -lconfuse -DCFGDIR=\"$(cfgdir)\" AM_CFLAGS = -pedantic -Wall -W -O1 -g3 -std=gnu99 -lusb -lconfuse \
-DCFGDIR=\"$(cfgdir)\" -DDATADIR=\"$(pkgdatadir)\"
xburst-tools_version.h: xburst-tools_version.h:
echo -e '#ifndef XBURST_TOOLS_VERSION' \ echo -e '#ifndef XBURST_TOOLS_VERSION' \
@ -10,11 +11,11 @@ bin_PROGRAMS = usbboot
usbboot_SOURCES = cmd.c command_line.c ingenic_cfg.c \ usbboot_SOURCES = cmd.c command_line.c ingenic_cfg.c \
ingenic_usb.c main.c ingenic_usb.c main.c
pkgdatadir = $(datadir)/xburst-tools pkgdatadir = $(datadir)/xburst-tools/
pkgdata_DATA = ../xburst_stage1/xburst_stage1.bin \ pkgdata_DATA = ../xburst_stage1/xburst_stage1.bin \
../xburst_stage2/xburst_stage2.bin ../xburst_stage2/xburst_stage2.bin
cfgdir = $(sysconfdir)/xburst-tools cfgdir = $(sysconfdir)/xburst-tools/
cfg_DATA = ../doc/usbboot.cfg cfg_DATA = ../doc/usbboot.cfg
EXTRA_DIST = $(pkgdatadir) $(cfgdir) EXTRA_DIST = $(pkgdatadir) $(cfgdir)

4
usbboot/src/ingenic_usb.h
View File

@ -51,8 +51,8 @@
#define VENDOR_ID 0x601a #define VENDOR_ID 0x601a
#define PRODUCT_ID 0x4740 #define PRODUCT_ID 0x4740
#define STAGE1_FILE_PATH "/usr/share/xburst-tools/xburst_stage1.bin" #define STAGE1_FILE_PATH (DATADIR "xburst_stage1.bin")
#define STAGE2_FILE_PATH "/usr/share/xburst-tools/xburst_stage2.bin" #define STAGE2_FILE_PATH (DATADIR "xburst_stage2.bin")
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))

2
usbboot/src/main.c
View File

@ -26,7 +26,7 @@
#include "ingenic_usb.h" #include "ingenic_usb.h"
#include "ingenic_cfg.h" #include "ingenic_cfg.h"
#define CONFIG_FILE_PATH (CFGDIR "/usbboot.cfg") #define CONFIG_FILE_PATH (CFGDIR "usbboot.cfg")
extern struct ingenic_dev ingenic_dev; extern struct ingenic_dev ingenic_dev;
extern struct hand hand; extern struct hand hand;