summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-03-05 15:33:09 +0000
committerKurt Zenker <kz@openoffice.org>2008-03-05 15:33:09 +0000
commit484d879af744172d43a1d134f89d0c9055848458 (patch)
tree34acaf59370e21545622a29638ff2318feb87928 /solenv
parent00c64df75da96ad2dd9852d3045edb423c47cb53 (diff)
INTEGRATION: CWS nowrapcmd2 (1.69.94); FILE MERGED
2008/03/01 00:35:42 vq 1.69.94.1: #i85207# Remove WRAPCMDs.
Diffstat (limited to 'solenv')
-rw-r--r--solenv/inc/tg_app.mk10
1 files changed, 3 insertions, 7 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index bc07e8d55035..bb0ae12123d4 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: tg_app.mk,v $
#
-# $Revision: 1.69 $
+# $Revision: 1.70 $
#
-# last change: $Author: rt $ $Date: 2007-11-07 16:09:59 $
+# last change: $Author: kz $ $Date: 2008-03-05 16:33:09 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -147,11 +147,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
.IF "$(APP$(TNR)LINKRES)" != ""
@@-$(RM) $(MISC)$/$(APP$(TNR)LINKRES:b).rc
.IF "$(APP$(TNR)ICON)" != ""
-.IF "$(USE_SHELL)"=="4nt"
- @-echo 1 ICON "$(APP$(TNR)ICON:s/\/\\/)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-.ELSE # "$(USE_SHELL)"=="4nt"
- @-$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP$(TNR)ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
-.ENDIF # "$(USE_SHELL)"=="4nt"
+ @-echo 1 ICON $(EMQ)"$(APP$(TNR)ICON:s/\/\\/)$(EMQ)" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc
.ENDIF # "$(APP$(TNR)ICON)" != ""
.IF "$(APP$(TNR)VERINFO)" != ""
@-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc