* fixed double zip options

  * fixed / between zipname and zipext
  * fixed auto ppas exec when -s is in compiler options

utils/fpcmake.ini

@@ -288,13 +288,6 @@ PPAS=ppas.bat
 endif
 endif
 
-# also call ppas if with command option -s
-ifeq (,$(findstring -s ,$(COMPILER)))
-EXECPPAS=
-else
-EXECPPAS:=@$(PPAS)
-endif
-
 # ldconfig to rebuild .so cache
 ifdef inlinux
 LDCONFIG=ldconfig
@@ -439,7 +432,7 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
 ZIPPROG=
 else
-ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
+ZIPPROG:=$(firstword $(ZIPPROG))
 endif
 endif
 export ZIPPROG
@@ -828,6 +821,13 @@ endif
 # Compiler commandline
 override COMPILER:=$(FPC) $(FPCOPT)
 
+# also call ppas if with command option -s
+ifeq (,$(findstring -s ,$(COMPILER)))
+EXECPPAS=
+else
+EXECPPAS:=@$(PPAS)
+endif
+
 
 [standardrules]
 #####################################################################
@@ -954,19 +954,19 @@ fpc_debug:
 
 %$(PPUEXT): %.pp
         $(COMPILER) $< $(REDIR)
-        $(EXECPASS)
+        $(EXECPPAS)
 
 %$(PPUEXT): %.pas
         $(COMPILER) $< $(REDIR)
-        $(EXECPASS)
+        $(EXECPPAS)
 
 %$(EXEEXT): %.pp
         $(COMPILER) $< $(REDIR)
-        $(EXECPASS)
+        $(EXECPPAS)
 
 %$(EXEEXT): %.pas
         $(COMPILER) $< $(REDIR)
-        $(EXECPASS)
+        $(EXECPPAS)
 
 
 [libraryrules]
@@ -1131,7 +1131,7 @@ ifdef USETAR
         $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
         cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
 else
-        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)/$(ZIPEXT)
+        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
         cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
 endif
         $(DELTREE) $(PACKDIR)