summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-08-19 15:27:34 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2014-08-19 15:27:34 +0800
commit0c827ee95c4ff6564eefabb519d00bfcccd046fe (patch)
treeb6253eaf09d0916a2e6d5b0ede89a8d912359501
parenta78778e54f7cc013080fda9d9349ad113ecb3e0e (diff)
downloadpango-0c827ee95c4ff6564eefabb519d00bfcccd046fe.tar.gz
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.
-rw-r--r--build/win32/vs10/pango-install.propsin2
-rw-r--r--build/win32/vs9/pango-install.vspropsin2
2 files changed, 1 insertions, 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&#x0D;&#x0A;
:DO_CREATE_PANGO_ALIASES&#x0D;&#x0A;
-if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango&#x0D;&#x0A;
if exist $(CopyDir)\etc\pango\pango.aliases goto END&#x0D;&#x0A;
+if not exist $(CopyDir)\etc\pango mkdir $(CopyDir)\etc\pango&#x0D;&#x0A;
echo tahoma = &quot;tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; > $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
echo sans = &quot;arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;
echo serif = &quot;times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal&quot; >> $(CopyDir)\etc\pango\pango.aliases&#x0D;&#x0A;