summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-12-17 15:06:49 +0100
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-12-17 15:06:49 +0100
commitd36a82beee90c264b069de70e13c37edeedf9491 (patch)
tree88485514cdc76f5b7b5e769513ef55797cd4081d
parent1c4f1f84466535a06c7b165c24aafdbb6efa1426 (diff)
parent5010f09cfc98d781662752200f249fb161f7e962 (diff)
CWS-TOOLING: integrate CWS ause128ooo/DEV300_m96
-rw-r--r--afms/makefile.mk3
-rw-r--r--external/prj/d.lst4
2 files changed, 5 insertions, 2 deletions
diff --git a/afms/makefile.mk b/afms/makefile.mk
index b1d2eaf..5952ada 100644
--- a/afms/makefile.mk
+++ b/afms/makefile.mk
@@ -53,6 +53,9 @@ ZIP1LIST = *.afm -x "*Helvetica-Narrow*"
.INCLUDE : tg_ext.mk
.IF "$(L10N_framework)"==""
+.IF "$(ZIP1TARGETN)"!=""
$(ZIP1TARGETN): $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE)
+.ENDIF # "$(ZIP1TARGETN)"!=""
+
.ENDIF # L10N_framework
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 9e0c681..ff1b19a 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -36,8 +36,8 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys
..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
-..\msvcp90\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-..\msvcp90\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%