diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-06-23 21:17:29 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-06-23 21:17:29 +0200 |
| commit | f35f3968c21bc8d01958ad1f92fe30e6ccc9c318 (patch) | |
| tree | 2d10d82ec489f225d58b185cf463a4f62ad45ed3 /Makefile | |
| parent | 54e19a7ded6e9dbdc3392a57d82f4f77b34e85b8 (diff) | |
| parent | 482126e27b3dbf0e69a6445da8b94b3551adf05d (diff) | |
| download | u-boot-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.zip u-boot-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.tar.gz u-boot-f35f3968c21bc8d01958ad1f92fe30e6ccc9c318.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -24,7 +24,7 @@ VERSION = 2010 PATCHLEVEL = 06 SUBLEVEL = -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc3 ifneq "$(SUBLEVEL)" "" U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) else @@ -385,8 +385,8 @@ $(VERSION_FILE): @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ $(TIMESTAMP_FILE): - @date +'#define U_BOOT_DATE "%b %d %C%y"' > $@ - @date +'#define U_BOOT_TIME "%T"' >> $@ + @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@ + @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@ gdbtools: $(MAKE) -C tools/gdb all || exit 1 @@ -2476,6 +2476,6 @@ endif backup: F=`basename $(TOPDIR)` ; cd .. ; \ - gtar --force-local -zcvf `date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F + gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F ######################################################################### |