Browse Source

* fix for Mantis 16504, change order of tarcommand for busybox and
other embedded/old tars.

git-svn-id: trunk@15290 -

marco 15 years ago
parent
commit
83245e2b1b
2 changed files with 2 additions and 2 deletions
  1. 1 1
      utils/fpcm/fpcmake.inc
  2. 1 1
      utils/fpcm/fpcmake.ini

+ 1 - 1
utils/fpcm/fpcmake.inc

@@ -2006,7 +2006,7 @@ const fpcmakeini : array[0..219,1..240] of char=(
   'ZIPCMD_CDBASE:=cd $(sub','st /,$(ZIPPATHSEP),$(BASEDIR))'#010+
   'ZIPCMD_CDBASE:=cd $(sub','st /,$(ZIPPATHSEP),$(BASEDIR))'#010+
   'ifdef USETAR'#010+
   'ifdef USETAR'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
-  'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
+  'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
   'else'#010+
   'else'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
   'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSE','P),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+
   'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSE','P),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+

+ 1 - 1
utils/fpcm/fpcmake.ini

@@ -1931,7 +1931,7 @@ ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
 ifdef USETAR
 ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
-ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
+ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *
 else
 else
 ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *