[ekiga] [windows] Fix startup error appeared with gconf->gsettings migration
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] [windows] Fix startup error appeared with gconf->gsettings migration
- Date: Thu, 23 Jan 2014 18:58:27 +0000 (UTC)
commit 337eb223b8838364590ab77c73e16a774d0fd617
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Thu Jan 23 19:56:29 2014 +0100
[windows] Fix startup error appeared with gconf->gsettings migration
win32/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index 00516d2..dce2609 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -246,9 +246,8 @@ update: update-sources
binaries:
@echo Checking prerequisites...
hash $(REALCC) $(REALCXX) $(LD) $(NM) $(AR) $(RANLIB) $(DLLTOOL) $(DLLWRAP) $(OBJDUMP) $(RC)
$(AS)||(echo You need to install mingw-w64 or mingw32; exit 1)
- hash tar unzip zip xz wget aclocal autoheader libtoolize automake autoconf pkg-config
gnome-autogen.sh bison gdk-pixbuf-csource || (echo we need more binaries ; exit 1)
+ hash tar unzip zip xz wget aclocal autoheader libtoolize automake autoconf pkg-config
gnome-autogen.sh bison glib-compile-schemas gdk-pixbuf-csource || (echo we need more binaries ; exit 1)
[ -f /usr/share/gnome-doc-utils/gnome-doc-utils.make ] || (echo gnome-doc-tools not installed; exit 1)
- [ -f /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/pkgconfig/gconf-2.0.pc -o
/usr/lib/pkgconfig/gconf-2.0.pc ] || (echo libgconf2-dev not installed; exit 1)
[ -f /usr/share/icons/gnome/index.theme ] || (echo gnome-icon-theme not installed; exit 1)
hash makensis || (echo nsis not installed; exit 1)
hash xmlto || (echo xmlto not installed; exit 1)
@@ -617,6 +616,7 @@ $(TARGETDIR)/zips: binaries $(EKIGA_DIR)/src/ekiga.exe
done
cp -r $(BUILDROOT)/share/locale $(EKIGA_PREFIX)/share
mkdir -p $(EKIGA_PREFIX)/share/glib-2.0; cp -r $(BUILDROOT)/share/glib-2.0/schemas
$(EKIGA_PREFIX)/share/glib-2.0
+ cd $(EKIGA_PREFIX); mv -f glib-2.0/schemas/* share/glib-2.0/schemas; rmdir glib-2.0/schemas; rmdir
glib-2.0; glib-compile-schemas share/glib-2.0/schemas
ifeq ($(MINGW32), 1)
cd $(EKIGA_PREFIX); cp /usr/share/doc/mingw32-runtime/mingwm10.dll.gz . && gunzip mingwm10.dll.gz
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]