[Sugar-devel] [PATCH 3/3] Add config.py.in and update AC_CONFIG_FILES.

[Tomeu Vizoso]

On Mon, Jun 14, 2010 at 06:14, Andrés Ambrois <andresambrois at gmail.com> wrote:
> config.py is generated from config.py.in at configure time by autoconf,
> so it needs to be added to AC_CONFIG_FILES in configure.ac.
>
> Signed-off-by: Andrés Ambrois <andresambrois at gmail.com>
>
>  create mode 100644 extensions/cpsection/modemconfiguration/config.py.in
>
> diff --git a/configure.ac b/configure.ac
> index 13a2f09..68a8bf3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -56,6 +56,7 @@ extensions/cpsection/frame/Makefile
>  extensions/cpsection/keyboard/Makefile
>  extensions/cpsection/language/Makefile
>  extensions/cpsection/modemconfiguration/Makefile
> +extensions/cpsection/modemconfiguration/config.py
>  extensions/cpsection/Makefile
>  extensions/cpsection/network/Makefile
>  extensions/cpsection/power/Makefile
> diff --git a/extensions/cpsection/modemconfiguration/Makefile.am b/extensions/cpsection/modemconfiguration/Makefile.am
> index 3e2613e..525e02e 100644
> --- a/extensions/cpsection/modemconfiguration/Makefile.am
> +++ b/extensions/cpsection/modemconfiguration/Makefile.am
> @@ -4,3 +4,5 @@ sugar_PYTHON =          \
>        __init__.py     \
>        model.py        \
>        view.py
> +
> +nodist_sugar_PYTHON = config.py
> diff --git a/extensions/cpsection/modemconfiguration/config.py.in b/extensions/cpsection/modemconfiguration/config.py.in
> new file mode 100644
> index 0000000..6fa688e
> --- /dev/null
> +++ b/extensions/cpsection/modemconfiguration/config.py.in
> @@ -0,0 +1,20 @@
> +# -*- encoding: utf-8 -*-
> +# Copyright (C) 2010 Andrés Ambrois
> +#
> +# 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
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  US
> +
> +PROVIDERS_PATH = "@prefix@/share/mobile-broadband-provider-info/serviceproviders.xml"
> +PROVIDERS_FORMAT_SUPPORTED = "2.0"
> +COUNTRY_CODES_PATH = "@prefix@/share/zoneinfo/iso3166.tab"

Hi,

we should instead be looking for these files in the paths in
$XDG_DATA_DIRS as per
http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html

Regards,

Tomeu

> --
> 1.6.3.3
>
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel
>