Kill FORCE2ARCHIVE.

Change-Id: Ie72dcc8ef9e82da1f0aa328648f20f9ed4a20482

configure.in

@@ -5953,7 +5953,12 @@ elif test "$enable_epm" = "yes"; then
         AC_MSG_ERROR([unknown system])
     esac
 else
-    PKGFORMAT=native
+    if test "$WITH_MINGW" = "yes"; then
+        # when tested, we should default this to 'msi', instead of 'archive'
+        PKGFORMAT=archive
+    else
+        PKGFORMAT=native
+    fi
 fi
 AC_MSG_RESULT([$PKGFORMAT])
 AC_SUBST(PKGFORMAT)

instsetoo_native/util/makefile.mk

@@ -41,11 +41,6 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
 .ENDIF			# "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
 
-.IF "$(OS)$(COM)" == "WNTGCC"
-# i.e. cross-compiling
-FORCE2ARCHIVE=TRUE
-.ENDIF
-
 ENABLE_DOWNLOADSETS*=TRUE
 
 .EXPORT: ENABLE_DOWNLOADSETS
@@ -128,10 +123,6 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 
-.IF "$(FORCE2ARCHIVE)" == "TRUE"
-PKGFORMAT = archive
-.END
-
 .IF "$(MAKETARGETS:e)"!=""
 PKGFORMAT+=$(MAKETARGETS:e:s/.//)
 .ENDIF			# "$(MAKETARGETS:e)"!=""