From 0c827ee95c4ff6564eefabb519d00bfcccd046fe Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 19 Aug 2014 15:27:34 +0800 Subject: MSVC Builds: Fix "Installation" Make sure we only try to create the directory for pango.aliases if that file didn't exist. This cleans things up a little, and avoids weird MSBuild batch errors. --- build/win32/vs10/pango-install.propsin | 2 -- build/win32/vs9/pango-install.vspropsin | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build/win32/vs10/pango-install.propsin b/build/win32/vs10/pango-install.propsin index 0f73207d..c252d9be 100644 --- a/build/win32/vs10/pango-install.propsin +++ b/build/win32/vs10/pango-install.propsin @@ -22,8 +22,6 @@ if "$(Configuration)" == "Release" goto DO_CREATE_PANGO_ALIASES if "$(Configuration)" == "Debug" goto DO_CREATE_PANGO_ALIASES -if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango - copy ..\..\..\pango\pangofc-decoder.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango copy ..\..\..\pango\pangofc-font.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango diff --git a/build/win32/vs9/pango-install.vspropsin b/build/win32/vs9/pango-install.vspropsin index 9956753f..44ace549 100644 --- a/build/win32/vs9/pango-install.vspropsin +++ b/build/win32/vs9/pango-install.vspropsin @@ -23,9 +23,9 @@ copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango :DO_CREATE_PANGO_ALIASES -if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango if exist $(CopyDir)\etc\pango\pango.aliases goto END +if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango echo tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" > $(CopyDir)\etc\pango\pango.aliases echo sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases echo serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal" >> $(CopyDir)\etc\pango\pango.aliases -- cgit v1.2.1