[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-125-g8913ba1)
The branch, master has been updated
discards 770766888e2d88d9552b4598a2c0a2016a9de315 (commit)
discards 02f63ca3dd7012134e7b5649c3a185edc67186a7 (commit)
via 8913ba1fa9d340aa00180bf37d1cddfa2fbc5a4a (commit)
from 770766888e2d88d9552b4598a2c0a2016a9de315 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
build-tools/desktop-i18n | 11 ++++++++---
libgeda/include/libgeda/prototype.h | 1 +
libgeda/src/f_basic.c | 14 ++++++++++++++
libgeda/src/o_list.c | 1 +
libgeda/src/s_basic.c | 4 ++++
libgeda/src/s_page.c | 4 ++++
libgeda/src/s_toplevel.c | 4 ++++
7 files changed, 36 insertions(+), 3 deletions(-)
=================
Commit Messages
=================
commit 8913ba1fa9d340aa00180bf37d1cddfa2fbc5a4a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Build desktop-i18n locale data correctly with DESTDIR set.
When doing an out-of-tree build with DESTDIR set, desktop-i18n's
temporary locale data tree was getting put in the wrong place. Fix
this by clearing DESTDIR and forcing prefix and localedir to the
correct values.
Fix suggested & tested by: Dan McMahill <dan@xxxxxxxxxxxx>
Bug reported & fix tested by: Charles Lepple <clepple@xxxxxxxxx>
:100755 100755 e3c44d4... 113c44b... M build-tools/desktop-i18n
=========
Changes
=========
commit 8913ba1fa9d340aa00180bf37d1cddfa2fbc5a4a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Build desktop-i18n locale data correctly with DESTDIR set.
When doing an out-of-tree build with DESTDIR set, desktop-i18n's
temporary locale data tree was getting put in the wrong place. Fix
this by clearing DESTDIR and forcing prefix and localedir to the
correct values.
Fix suggested & tested by: Dan McMahill <dan@xxxxxxxxxxxx>
Bug reported & fix tested by: Charles Lepple <clepple@xxxxxxxxx>
diff --git a/build-tools/desktop-i18n b/build-tools/desktop-i18n
index e3c44d4..113c44b 100755
--- a/build-tools/desktop-i18n
+++ b/build-tools/desktop-i18n
@@ -1,7 +1,8 @@
#!/bin/sh
# -*-Shell-script-*-
# Helper script for translating desktop integration data
-# Copyright (C) 2009 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2009-2010 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2010 Dan McMahill <dan@xxxxxxxxxxxx>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -483,7 +484,8 @@ EOF
# DESKTOP_I18N_RULES (Do not edit or remove this line)
#####################################################################
# Makefile rules needed by the desktop-i18n tool.
-# Copyright (C) 2009 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2009-2010 Peter Brett <peter@xxxxxxxxxxxxx>
+# Copyright (C) 2010 Dan McMahill <dan@xxxxxxxxxxxx>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -511,7 +513,10 @@ DESKTOP_I18N_LOCALE_DIR = @DESKTOP_I18N_LOCALE_DIR@
all: stamp-i18n
stamp-i18n: \$(DESKTOP_I18N_LOCALE_DIR) stamp-po Makefile
@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
- \$(MAKE) prefix=\$(DESKTOP_I18N_LOCALE_DIR) install && \
+ \$(MAKE) \
+ prefix=\$(DESKTOP_I18N_LOCALE_DIR) \
+ localedir=\$(DESKTOP_I18N_LOCALE_DIR)/share/locale \
+ DESTDIR= install && \
cp \$(srcdir)/LINGUAS \$(DESKTOP_I18N_LOCALE_DIR)/\$(DOMAIN).LINGUAS \
|| rm stamp-i18n
@echo timestamp > stamp-i18nT && mv stamp-i18nT stamp-i18n
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs