diff options
| author | sb <sb@openoffice.org> | 2010-02-16 11:33:16 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-02-16 11:33:16 +0100 |
| commit | ee90a96ae70d1d4ab65ef037bed45d1a9efb7e2c (patch) | |
| tree | 6f6efdd22f0a9bc571b0b7726b5b3d7e7ef2fa06 /solenv/inc/installationtest.mk | |
| parent | sb118: improved OOO_JUNIT_JAR configure check (diff) | |
| download | core-ee90a96ae70d1d4ab65ef037bed45d1a9efb7e2c.tar.gz core-ee90a96ae70d1d4ab65ef037bed45d1a9efb7e2c.zip | |
sb118: handle --without-junit gracefully
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 33c0b493c2db..0fea6830008b 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -102,7 +102,7 @@ $(MISC)/$(TARGET)/services.rdb : $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \ -c remotebridge.uno -c uuresolver.uno -.IF "$(SOLAR_JAVA)" == "TRUE" +.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != "" javatest .PHONY : $(MISC)/$(TARGET)/installation.flag $(JAVATARGET) $(RM) -r $(MISC)/$(TARGET)/user $(MKDIR) $(MISC)/$(TARGET)/user @@ -118,5 +118,5 @@ javatest .PHONY : $(MISC)/$(TARGET)/installation.flag $(JAVATARGET) .END .ELSE javatest .PHONY : - echo 'javatest needs SOLAR_JAVA=TRUE' + echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR' .END |