diff options
author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-12 23:22:35 +0800 |
---|---|---|
committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-10-12 23:22:35 +0800 |
commit | 6f7029bb67d4ae2b0bc0b3ea1b0f066e2bd71c4c (patch) | |
tree | ab8f0310870db3531c568d44cbc90aae93953fa1 /build | |
parent | 7aa2bfdc774bde4ac58f18533f03679cd5833421 (diff) | |
download | gtk+-6f7029bb67d4ae2b0bc0b3ea1b0f066e2bd71c4c.tar.gz |
MSVC builds: Fix "install"
Use $(GlibEtcInstallRoot) when invoking glib-compile-schemas, as CopyDir
is not GlibInstallRoot for GTK+ (due to quoting issues), meaning that the
glib-compile-schemas tool may not be found in certain cases.
Issue pointed out by Ignacio Casal Quinteiro.
Diffstat (limited to 'build')
-rw-r--r-- | build/win32/vs10/gtk3-install.propsin | 2 | ||||
-rw-r--r-- | build/win32/vs9/gtk3-install.vspropsin | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin index 5af28b0a5f..7d875da1a9 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk3-install.propsin @@ -109,7 +109,7 @@ copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\gli copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas echo "Compiling gsettings XML Files..." -$(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas +$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas </GtkDoInstall> <GtkDoInstallBroadwayHeaders> copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin index 081c010838..1b102ef6d0 100644 --- a/build/win32/vs9/gtk3-install.vspropsin +++ b/build/win32/vs9/gtk3-install.vspropsin @@ -112,7 +112,7 @@ copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\s copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 echo "Compiling gsettings XML Files..."
 -$(CopyDir)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
 +$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
 " /> <UserMacro |