diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:43:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:43:44 +0000 |
| commit | 2ea65f7ffd7d23ccbef6b81a023f57336c6b3321 (patch) | |
| tree | 6cd2fad066c41f05aa2c607353baff715c9480b5 /solenv/inc/tg_app.mk | |
| parent | fcb9f9ae65a70f070d86f5c7677c3eb6a28ba9da (diff) | |
INTEGRATION: CWS ooo20030412 (1.37.2.2.20); FILE MERGED
2003/04/03 15:18:55 vq 1.37.2.2.20.3: #12004 Replace \ with \\. Fix for the previous patch.
2003/03/31 19:00:57 vq 1.37.2.2.20.2: #12818 Hash signs need escaping.
2003/03/27 08:41:41 vq 1.37.2.2.20.1: IZ12004: Fix a problem with APPxICON for W32-tcsh.
Diffstat (limited to 'solenv/inc/tg_app.mk')
| -rw-r--r-- | solenv/inc/tg_app.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 194cd8d19259..dc8b46362aa3 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -2,9 +2,9 @@ # # $RCSfile: tg_app.mk,v $ # -# $Revision: 1.38 $ +# $Revision: 1.39 $ # -# last change: $Author: hr $ $Date: 2003-03-27 11:48:12 $ +# last change: $Author: hr $ $Date: 2003-04-28 16:43:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -219,11 +219,11 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP$(TNR)ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP$(TNR)ICON:s/\//\/\//)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @-+guw.pl echo 1 ICON \"$(APP$(TNR)ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF .IF "$(APP$(TNR)VERINFO)" != "" - @-+echo #define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc - @-+echo #include \"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @-+echo \#include \"$(APP$(TNR)VERINFO)\" >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc |