10:40 a.m.
On 10/23/2014 05:36 AM, Zhou Zheng Sheng wrote:
on 2014/10/23 23:05, Simon Jin wrote:
> Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com>
> ---
> configure.ac | 1 +
> src/kimchi/Makefile.am | 2 +-
> src/kimchi/xmlutils/Makefile.am | 25 +++++++++++++++++++++++++
> 3 files changed, 27 insertions(+), 1 deletion(-)
> create mode 100644 src/kimchi/xmlutils/Makefile.am
>
> diff --git a/configure.ac b/configure.ac
> index d64ddc2..1b476c3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -84,6 +84,7 @@ AC_CONFIG_FILES([
> src/kimchi/control/Makefile
> src/kimchi/control/vm/Makefile
> src/kimchi/model/Makefile
> + src/kimchi/xmlutils/Makefile
> plugins/Makefile
> plugins/sample/Makefile
> plugins/sample/po/Makefile.in
> diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am
> index 84def58..5c204e0 100644
> --- a/src/kimchi/Makefile.am
> +++ b/src/kimchi/Makefile.am
> @@ -17,7 +17,7 @@
> # License along with this library; if not, write to the Free Software
> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
>
> -SUBDIRS = control model
> +SUBDIRS = control model xmlutils
>
> kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py))
>
> diff --git a/src/kimchi/xmlutils/Makefile.am b/src/kimchi/xmlutils/Makefile.am
> new file mode 100644
> index 0000000..5c246cb
> --- /dev/null
> +++ b/src/kimchi/xmlutils/Makefile.am
> @@ -0,0 +1,25 @@
> +#
> +# Kimchi
> +#
> +# Copyright IBM Corp, 2014
> +#
> +# This library is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU Lesser General Public
> +# License as published by the Free Software Foundation; either
> +# version 2.1 of the License, or (at your option) any later version.
> +#
> +# This library 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
> +# Lesser General Public License for more details.
> +#
> +# You should have received a copy of the GNU Lesser General Public
> +# License along with this library; if not, write to the Free Software
> +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> +
> +model_PYTHON = *.py
> +
> +modeldir = $(pythondir)/kimchi/xmlutils
Maybe "xmlutils_PYTHON" and "xmlutilsdir" are better variable names.
> +
> +install-data-local:
> + $(MKDIR_P) $(DESTDIR)$(modeldir)
>
May I suggest "$(MKDIR_P) $(DESTDIR)$(xmlutilsdir)" ?
I also notice that in the spec file, we should add
%{python_sitelib}/kimchi/xmlutilsdir/*.py*
That issue is being commonly reported as it blocks users to run Kimchi:
https://github.com/kimchi-project/kimchi/issues/469
https://github.com/kimchi-project/kimchi/pull/468
So I will do the changes suggested by Zheng Zhou and apply it.