diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 12:37:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-02 12:37:32 +0000 |
| commit | 8c2acb9ddf97e7932dd4e7b23815b9b9b23a27f3 (patch) | |
| tree | 14720b2f1a5c2309a4c27ac4fb4a4982894280b2 /odk/util | |
| parent | ee0782ca0fc1f061a7ff4557049489a4aabda407 (diff) | |
INTEGRATION: CWS ooo11rc (1.2.4); FILE MERGED
2003/06/26 17:42:00 vq 1.2.4.1: #i16117# Fix for W32-tcsh, verified by hjs.
Diffstat (limited to 'odk/util')
| -rw-r--r-- | odk/util/odk_rules.pmk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index 40a38748b324..2bd752314d4b 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -2,9 +2,9 @@ # # $RCSfile: odk_rules.pmk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: vg $ $Date: 2003-06-10 10:52:01 $ +# last change: $Author: vg $ $Date: 2003-07-02 13:37:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -95,7 +95,7 @@ $(DESTDIR)$/configure : $(PRJ)$/configure +-$(MKDIRHIER) $(@:d) +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" +.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" +-chmod 755 $@ .ENDIF @@ -103,7 +103,7 @@ $(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl +-$(MKDIRHIER) $(@:d) +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" +.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" +-chmod 755 $@ .ENDIF @@ -111,7 +111,7 @@ $(DESTDIR)$/setsdkenv_unix.in : $(PRJ)$/setsdkenv_unix.in +-$(MKDIRHIER) $(@:d) +-rm -f $@ >& $(NULLDEV) $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/setsdkenv_unix.in $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" +.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" +-chmod 755 $@ .ENDIF @@ -328,7 +328,7 @@ $(DESTDIRSETTINGS)$/dk.mk : +-rm -f $@ >& $(NULLDEV) echo #$(PRODUCT_NAME) dependent settings > $@ echo DKNAME=${PRODUCT_NAME} >> $@ -.IF "$(GUI)"=="UNX" +.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" echo 'DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)types.rdb")' >> $@ .ELSE echo DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)types.rdb") >> $@ |