diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-01 12:26:01 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-01 12:26:01 +0000 |
| commit | b18a495be57491ec06d78bb84bd5daf99953e8b4 (patch) | |
| tree | 2d996b8371f98c9f1fd2ad61862057841da814c0 | |
| parent | 29d9e502e805e7cc360d87adc98a42e7876f3edc (diff) | |
INTEGRATION: CWS vq13 (1.4.6); FILE MERGED
2005/02/26 15:03:05 vq 1.4.6.1: #i43294# Fix W32-4nt build in scp2.
| -rw-r--r-- | scp2/macros/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk index 9cb0872c187d..6a9516b8ad93 100644 --- a/scp2/macros/makefile.mk +++ b/scp2/macros/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.5 $ # -# last change: $Author: vg $ $Date: 2005-02-21 12:14:18 $ +# last change: $Author: kz $ $Date: 2005-03-01 13:26:01 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,8 +72,8 @@ TARGET=macros .INCLUDE : target.mk # force expanding -completelangiso_var:=$(completelangiso) -.EXPORT : completelangiso_var +COMPLETELANGISO_VAR:=$(completelangiso) +.EXPORT : COMPLETELANGISO_VAR CUSTOM_IMAGE_SETS:=$(CUSTOM_IMAGE_SETS) .EXPORT : CUSTOM_IMAGE_SETS @@ -87,6 +87,6 @@ ALLTAR : $(INCCOM)$/langmacros.inc $(INCCOM)$/images.inc +$(PERL) macro.pl -o $@.tmp && $(RENAME) $@.tmp $@ .PHONY $(INCCOM)$/images.inc: - +-$(RENAME) $@ $@.tmp >& $(NULLDEV) - +$(PERL) -w images.pl -o $@.tmp && $(RENAME) $@.tmp $@ + +-$(RENAME) $@ $@.tmp >& $(NULLDEV) + +$(PERL) -w images.pl -o $@.tmp && $(RENAME) $@.tmp $@ |