diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-09-20 12:15:59 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-09-20 12:15:59 +0000 |
commit | 4a91ce32bb7f77efee5c4e1fb046c9cf48f0652a (patch) | |
tree | f83bb132ec89d7398aa481c4f2e5dd2698da3569 /jpeg | |
parent | cf48cf7ab39f369d0f8f983316f9a8f6441fb00b (diff) |
INTEGRATION: CWS systemjpg1 (1.2.68); FILE MERGED
2004/09/17 15:30:21 cmc 1.2.68.1: #i34307# don't build jpeg if system jpeg selected
Diffstat (limited to 'jpeg')
-rw-r--r-- | jpeg/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk index d1ab85767d73..6030bfb12724 100644 --- a/jpeg/makefile.mk +++ b/jpeg/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: hr $ $Date: 2003-03-26 12:25:38 $ +# last change: $Author: rt $ $Date: 2004-09-20 13:15:59 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,6 +69,12 @@ TARGET=jpeg .INCLUDE : settings.mk +.IF "$(SYSTEM_JPEG)" == "YES" +all: + @echo "An already available installation of libjpeg should exist on your system." + @echo "Therefore the version provided here does not need to be built in addition." +.ENDIF + # --- Files -------------------------------------------------------- TARFILE_NAME=jpeg-6b |