diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-06 15:19:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-06 15:19:27 +0000 |
| commit | 89ba47c4a935ab27600a8cf12d9e72e9d47b8886 (patch) | |
| tree | 4ec9ffe1989507bd69d1045316faf9d73e75c46e | |
| parent | a4ab3deec7bb85c5a29c4eb37b7b222992dabf97 (diff) | |
INTEGRATION: CWS vq28 (1.66.68); FILE MERGED
2006/02/05 04:18:38 vq 1.66.68.4: #i61212# Don't overwrite the PWD macro if it's not needed.
2006/02/03 14:11:22 vq 1.66.68.3: #i61212# Revert changes.
2006/01/30 02:05:53 vq 1.66.68.2: RESYNC: (1.66-1.67); FILE MERGED
2006/01/30 01:53:03 vq 1.66.68.1: #i61212# Remove code that overrides dmake's PWD macro.
| -rw-r--r-- | solenv/inc/tg_ext.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index dd811145ed21..51d192cd8e7b 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_ext.mk,v $ # -# $Revision: 1.67 $ +# $Revision: 1.68 $ # -# last change: $Author: obo $ $Date: 2006-01-20 12:09:33 $ +# last change: $Author: rt $ $Date: 2006-02-06 16:19:27 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -82,11 +82,11 @@ PATCH_FILE_DEP:=$(PRJ)$/$(NEW_PATCH_FILE_NAME) TAR_EXCLUDE_SWITCH=--exclude=$(TAR_EXCLUDES) .ENDIF # "$(TAR_EXCLUDES)"!="" -#clean PWD to let a build_action=dmake set it with new value -.IF "$(GUI)"=="WNT" +# Clean PWD to let a build_action=dmake set it with new value. (See iz61212) +.IF "$(USE_SHELL)"=="4nt" PWD:= .EXPORT : PWD -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(USE_SHELL)"=="4nt" .IF "$(ADDITIONAL_FILES)"!="" P_ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES) $(MISC)$/$(TARFILE_ROOTDIR)$/$i) |