diff options
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 2baafb4013d2..ddbb22f1b1f0 100644 --- a/configure.in +++ b/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) diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 54e399de9dbe..a4dc1f9f461c 100644 --- a/instsetoo_native/util/makefile.mk +++ b/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)"!="" |