diff options
Diffstat (limited to 'javainstaller2')
3 files changed, 13 insertions, 4 deletions
diff --git a/javainstaller2/src/Helpfiles/makefile.mk b/javainstaller2/src/Helpfiles/makefile.mk index a45253613e5d..0f77f31a19ed 100755 --- a/javainstaller2/src/Helpfiles/makefile.mk +++ b/javainstaller2/src/Helpfiles/makefile.mk @@ -43,8 +43,15 @@ INPUT=java_ulffiles .INCLUDE : target.mk .IF "$(SOLAR_JAVA)"!="" +.IF "$(WITH_LANG)"=="" +ULFDIR:=$(PRJ)/src/Localization +.ELSE #"$(WITH_LANG)"=="" +ULFDIR:=$(COMMONMISC)/$(INPUT) +.ENDIF #"$(WITH_LANG)"=="" + + ALLTAR: $(BIN)$/Prologue.html -$(BIN)$/Prologue.html : create_helpfiles.pl helpfilenames.txt $(COMMONMISC)$/$(INPUT)$/setupstrings.ulf - $(PERL) create_helpfiles.pl $/ $(COMMONMISC)$/$(INPUT) $(BIN) +$(BIN)$/Prologue.html : create_helpfiles.pl helpfilenames.txt $(ULFDIR)/setupstrings.ulf + $(PERL) create_helpfiles.pl / $(ULFDIR) $(BIN) .ENDIF diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java index ccc1e7bf11df..ad3460159262 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java @@ -120,8 +120,8 @@ public class SolarisHelper { String mailLine = "mail="; adminFile.add(mailLine); - String conflictLine = "conflict=quit"; - if ( data.isUserInstallation() ) { conflictLine = "conflict=nocheck"; } + String conflictLine = "conflict=nochange"; + if ( data.isUserInstallation() ) { conflictLine = "conflict=nochange"; } adminFile.add(conflictLine); String runlevelLine = "runlevel=nocheck"; diff --git a/javainstaller2/src/Localization/makefile.mk b/javainstaller2/src/Localization/makefile.mk index 27f679318d85..30161590cdb8 100755 --- a/javainstaller2/src/Localization/makefile.mk +++ b/javainstaller2/src/Localization/makefile.mk @@ -30,7 +30,9 @@ PRJ=..$/.. PRJNAME=javainstaller2 TARGET=java_ulffiles +.IF "$(WITH_LANG)"!="" WITH_LANG!:=ALL +.ENDIF # "$(WITH_LANG)"!="" # --- Settings ----------------------------------------------------- |