diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 14:12:25 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-03 14:12:25 +0000 |
| commit | 3a870742ab752d5365301197395398eaeba15634 (patch) | |
| tree | baf863f6462e47a6c2643920ed50acee9c5509f3 /odk/util | |
| parent | 0c7a5d64aacfcf563c6e22c14ed6541aef3a0536 (diff) | |
INTEGRATION: CWS unowinregcross (1.19.22); FILE MERGED
2006/07/26 17:19:12 rene 1.19.22.2: RESYNC: (1.19-1.20); FILE MERGED
2006/07/16 15:46:25 rene 1.19.22.1: #i49718# make unowinreg.dll rebuildable
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/odk_rules.pmk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index ca3d0fb558da..a63ac47cdddf 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -2,9 +2,9 @@ # # $RCSfile: odk_rules.pmk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: obo $ $Date: 2006-07-13 12:04:35 $ +# last change: $Author: ihi $ $Date: 2006-08-03 15:12:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -146,8 +146,9 @@ $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX) .ENDIF # special rule for special Java UNO native library -# (used for all platforms but built only under windows) -$(DESTDIRJAR)$/win$/unowinreg.dll : $(PRJ)$/bin$/win$/unowinreg.dll +# (used for all platforms but built only under windows; +# otherwise provided in external) +$(DESTDIRJAR)$/win$/unowinreg.dll : $(BIN)$/unowinreg.dll +-rm -f $@ >& $(NULLDEV) $(GNUCOPY) $< $@ |