diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-01 14:59:06 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-01 14:59:06 +0300 |
| commit | f975a503fcf4acc5e9600f58bf0ed55c3a49b802 (patch) | |
| tree | 2f0181ee3326221e072855a8c90e5b979e5340ad | |
| parent | 2cf6cd66a22a7458f7c7c8b3c33416783cf269e7 (diff) | |
USE_PACKAGER is not set anywhere, so factor it out
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 800bcbff4ef4..20cd85fe2b97 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -84,11 +84,10 @@ allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j xxxx: echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml -.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" +.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" ALLTAR : $(LOCALPYFILES) @echo "No EPM: do no packaging at this stage" -.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" -.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" +.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE" .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) @@ -102,10 +101,7 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $( ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US .ENDIF .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE" -.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" -ALLTAR : updatepack -.ENDIF # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" -.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" +.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO" .IF "$(FORCE2ARCHIVE)" == "TRUE" PKGFORMAT = archive |