[Kimchi-devel] [RFC PATCH V2 08/31] Update kimchi plugin makefiles

- Reflect new plugin structure in all base files. - Add kimchi plugin specifics (spice, config.py) - Remove wok specifics Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com&gt; Signed-off-by: Gustavo Y. Ribeiro <gyr(a)linux.vnet.ibm.com&gt; --- plugins/kimchi/.gitignore | 8 +-- plugins/kimchi/Makefile.am | 94 +++++++++----------- plugins/kimchi/configure.ac | 44 ++------- plugins/kimchi/contrib/Makefile.am | 4 - plugins/kimchi/control/Makefile.am | 2 +- plugins/kimchi/control/vm/Makefile.am | 2 +- plugins/kimchi/docs/Makefile.am | 3 - plugins/kimchi/model/Makefile.am | 2 +- plugins/kimchi/po/POTFILES.in | 3 +- plugins/kimchi/tests/Makefile.am | 2 +- plugins/kimchi/ui/Makefile.am | 4 +- plugins/kimchi/ui/config/Makefile.am | 4 +- plugins/kimchi/ui/css/Makefile.am | 2 +- plugins/kimchi/ui/images/Makefile.am | 2 +- plugins/kimchi/ui/images/theme-default/Makefile.am | 2 +- plugins/kimchi/ui/js/Makefile.am | 2 +- plugins/kimchi/ui/libs/Makefile.am | 2 +- plugins/kimchi/ui/libs/themes/base/Makefile.am | 2 +- .../kimchi/ui/libs/themes/base/images/Makefile.am | 2 +- plugins/kimchi/ui/pages/Makefile.am | 4 +- plugins/kimchi/ui/pages/help/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/de_DE/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/en_US/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/es_ES/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/fr_FR/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/it_IT/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/ja_JP/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/ko_KR/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/pt_BR/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/ru_RU/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/zh_CN/Makefile.am | 2 +- plugins/kimchi/ui/pages/help/zh_TW/Makefile.am | 2 +- plugins/kimchi/ui/pages/tabs/Makefile.am | 2 +- plugins/kimchi/ui/spice-html5/Makefile.am | 2 +- plugins/kimchi/ui/spice-html5/css/Makefile.am | 2 +- plugins/kimchi/ui/spice-html5/pages/Makefile.am | 2 +- .../kimchi/ui/spice-html5/thirdparty/Makefile.am | 2 +- plugins/kimchi/xmlutils/Makefile.am | 2 +- 38 files changed, 92 insertions(+), 134 deletions(-) diff --git a/plugins/kimchi/.gitignore b/plugins/kimchi/.gitignore index b3988b6..1dae610 100644 --- a/plugins/kimchi/.gitignore +++ b/plugins/kimchi/.gitignore @@ -16,25 +16,19 @@ build-aux/missing build-aux/py-compile configure config.log +config.py config.status contrib/DEBIAN/control contrib/kimchi.spec.fedora contrib/kimchi.spec.suse contrib/make-deb.sh -docs/kimchid.8 *.min.css *.min.js *.gmo stamp-po kimchi-*.tar.gz -src/kimchid -src/kimchi.conf -src/nginx/kimchi.conf -src/kimchi/config.py tests/run_tests.sh tests/test_config.py -plugins/sample/po/POTFILES -plugins/sample/sample.conf po/POTFILES po/gen-pot *.orig diff --git a/plugins/kimchi/Makefile.am b/plugins/kimchi/Makefile.am index 1a0c8e7..1e1287b 100644 --- a/plugins/kimchi/Makefile.am +++ b/plugins/kimchi/Makefile.am @@ -16,9 +16,24 @@ # 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 -SUBDIRS = src ui docs contrib tests po config plugins -man_MANS = docs/kimchid.8 +SUBDIRS = contrib control distros.d docs model po tests ui xmlutils + +kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py)) + +nodist_kimchi_PYTHON = config.py + +if WITH_SPICE +WITH_SPICE=yes +else +WITH_SPICE=no +endif + +wokdir = $(pythondir)/wok +kimchidir = $(pythondir)/wok/plugins/kimchi + +confdir = $(sysconfdir)/wok/plugins.d +dist_conf_DATA = kimchi.conf template.conf AUTOMAKE_OPTIONS = foreign @@ -26,28 +41,26 @@ ACLOCAL_AMFLAGS = --install -I m4 EXTRA_DIST = \ config.rpath \ + API.json \ autogen.sh \ COPYING.ASL2 \ COPYING.LGPL \ CONTRIBUTE.md \ VERSION \ build-aux/pkg-version \ + config.py.in \ $(NULL) -PEP8_BLACKLIST = *src/kimchi/config.py,*src/kimchi/i18n.py,*tests/test_config.py +PEP8_BLACKLIST = *config.py,*i18n.py,*tests/test_config.py -SKIP_PYFLAKES_ERR = "\./src/kimchi/websocket\.py" - -I18N_FILES = plugins/*/i18n.py \ - src/kimchi/i18n.py \ +I18N_FILES = i18n.py \ $(NULL) check-local: - PYTHONPATH=src contrib/check_i18n.py $(I18N_FILES) + contrib/check_i18n.py $(I18N_FILES) find . -path './.git' -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ - grep -w -v $(SKIP_PYFLAKES_ERR) | \ while read LINE; do echo "$$LINE"; false; done $(PEP8) --version @@ -63,6 +76,22 @@ all-local: ln -sf ../../../po/$$L.gmo $$dir/kimchi.mo ; \ done < po/LINGUAS +do_substitution = \ + sed -e 's,[@]prefix[@],$(prefix),g' \ + -e 's,[@]datadir[@],$(datadir),g' \ + -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ + -e 's,[@]localstatedir[@],$(localstatedir),g' \ + -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ + -e 's,[@]wokdir[@],$(wokdir),g' \ + -e 's,[@]kimchidir[@],$(kimchidir),g' \ + -e 's,[@]kimchiversion[@],$(PACKAGE_VERSION),g' \ + -e 's,[@]kimchirelease[@],$(PACKAGE_RELEASE),g' \ + -e 's,[@]withspice[@],$(WITH_SPICE),g' + +config.py: config.py.in Makefile + $(do_substitution) < $(srcdir)/config.py.in > config.py + + # # Packaging helpers # @@ -71,15 +100,7 @@ install-deb: install cp -R $(top_srcdir)/contrib/DEBIAN $(DESTDIR)/ mkdir -p $(DESTDIR)/var/lib/kimchi/debugreports mkdir -p $(DESTDIR)/var/lib/kimchi/screenshots - mkdir -p $(DESTDIR)/var/lib/kimchi/vnc-tokens mkdir -p $(DESTDIR)/var/lib/kimchi/isos - touch $(DESTDIR)/var/lib/kimchi/objectstore - $(MKDIR_P) $(DESTDIR)/etc/init - $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services - cp -R $(top_srcdir)/contrib/kimchid-upstart.conf.debian \ - $(DESTDIR)/etc/init/kimchid.conf - cp -R $(top_srcdir)/src/firewalld.xml \ - $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml deb: contrib/make-deb.sh @@ -115,41 +136,13 @@ ChangeLog: fi install-data-local: - @if test -d $(systemdsystemunitdir) ; then \ - mkdir -p $(DESTDIR)/$(systemdsystemunitdir); \ - $(INSTALL_DATA) contrib/kimchid.service.fedora $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ - else \ - mkdir -p $(DESTDIR)/etc/init.d/ \ - $(INSTALL_DATA) contrib/kimchid.sysvinit $(DESTDIR)/etc/init.d/kimchid; \ - chmod +x $(DESTDIR)/etc/init.d/kimchid; \ - fi; \ - if test -d /usr/lib/firewalld/services/; then \ - mkdir -p $(DESTDIR)/usr/lib/firewalld/services/; \ - $(INSTALL_DATA) src/firewalld.xml $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ - fi; \ - mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,vnc-tokens,isos} - touch $(DESTDIR)/var/lib/kimchi/objectstore - mkdir -p $(DESTDIR)/var/log/kimchi/ - touch $(DESTDIR)/var/log/kimchi/kimchi-access.log - touch $(DESTDIR)/var/log/kimchi/kimchi-error.log - mkdir -p $(DESTDIR)/etc/kimchi/ - $(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/kimchi/dhparams.pem - touch $(DESTDIR)/etc/nginx/conf.d/kimchi.conf + $(MKDIR_P) $(DESTDIR)$(kimchidir) + $(INSTALL_DATA) API.json $(DESTDIR)$(kimchidir)/API.json + mkdir -p $(DESTDIR)/var/lib/kimchi/{debugreports,screenshots,isos} uninstall-local: - @if test -f $(systemdsystemunitdir)/kimchid.service; then \ - $(RM) $(DESTDIR)/$(systemdsystemunitdir)/kimchid.service; \ - elif test -f /etc/init.d/kimchid; then \ - $(RM) $(DESTDIR)/etc/init.d/kimchid; \ - $(RM) $(DESTDIR)/etc/init/kimchi.conf; \ - fi; \ - if test -d /usr/lib/firewalld/services/; then \ - $(RM) $(DESTDIR)/usr/lib/firewalld/services/kimchid.xml; \ - fi; \ + $(RM) $(DESTDIR)$(kimchidir)/API.json $(RM) -rf $(DESTDIR)/var/lib/kimchi - $(RM) -rf $(DESTDIR)/var/log/kimchi - $(RM) -rf $(DESTDIR)/etc/kimchi - $(RM) $(DESTDIR)/etc/nginx/conf.d/kimchi.conf VERSION: @if test -d .git; then \ @@ -162,4 +155,5 @@ VERSION: clean-local: rm -rf mo rpm -CLEANFILES = kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print` +BUILT_SOURCES = config.py +CLEANFILES = config.py kimchi.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print` diff --git a/plugins/kimchi/configure.ac b/plugins/kimchi/configure.ac index 0261b5f..843307a 100644 --- a/plugins/kimchi/configure.ac +++ b/plugins/kimchi/configure.ac @@ -64,15 +64,6 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi -# check for systemd -PKG_PROG_PKG_CONFIG -AC_ARG_WITH([systemdsystemunitdir], - AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) -if test "x$with_systemdsystemunitdir" != xno; then - AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -fi - AC_ARG_WITH( [spice-html5], [AS_HELP_STRING([--with-spice-html5], @@ -87,36 +78,24 @@ AC_CONFIG_FILES([ po/gen-pot Makefile docs/Makefile - docs/kimchid.8 - src/Makefile - src/distros.d/Makefile - src/nginx/Makefile - src/kimchi/Makefile - 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 - plugins/sample/sample.conf - plugins/sample/ui/Makefile - plugins/sample/ui/config/Makefile - plugins/sample/ui/js/Makefile - plugins/sample/ui/pages/Makefile + distros.d/Makefile + control/Makefile + control/vm/Makefile + model/Makefile ui/Makefile + ui/config/Makefile ui/css/Makefile ui/images/Makefile ui/images/theme-default/Makefile ui/js/Makefile - ui/spice-html5/Makefile - ui/spice-html5/css/Makefile - ui/spice-html5/pages/Makefile - ui/spice-html5/thirdparty/Makefile ui/libs/Makefile ui/libs/themes/Makefile ui/libs/themes/base/Makefile ui/libs/themes/base/images/Makefile + ui/spice-html5/Makefile + ui/spice-html5/css/Makefile + ui/spice-html5/pages/Makefile + ui/spice-html5/thirdparty/Makefile ui/pages/Makefile ui/pages/help/Makefile ui/pages/help/en_US/Makefile @@ -130,16 +109,13 @@ AC_CONFIG_FILES([ ui/pages/help/ru_RU/Makefile ui/pages/help/zh_CN/Makefile ui/pages/help/zh_TW/Makefile - ui/pages/tabs/Makefile - ui/pages/websockify/Makefile contrib/Makefile contrib/DEBIAN/Makefile contrib/DEBIAN/control contrib/kimchi.spec.fedora contrib/kimchi.spec.suse tests/Makefile - config/Makefile - config/ui/Makefile + xmlutils/Makefile ],[ chmod +x po/gen-pot ]) diff --git a/plugins/kimchi/contrib/Makefile.am b/plugins/kimchi/contrib/Makefile.am index 393306f..5001191 100644 --- a/plugins/kimchi/contrib/Makefile.am +++ b/plugins/kimchi/contrib/Makefile.am @@ -18,11 +18,7 @@ SUBDIRS = DEBIAN EXTRA_DIST = \ check_i18n.py \ - kimchid.sysvinit \ - kimchid.service.fedora \ kimchi.spec.fedora.in \ - kimchid-upstart.conf.debian \ - kimchid-upstart.conf.fedora \ make-deb.sh.in \ $(NULL) diff --git a/plugins/kimchi/control/Makefile.am b/plugins/kimchi/control/Makefile.am index fee98dc..33118ca 100644 --- a/plugins/kimchi/control/Makefile.am +++ b/plugins/kimchi/control/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS = vm control_PYTHON = *.py -controldir = $(pythondir)/kimchi/control +controldir = $(pythondir)/wok/plugins/kimchi/control install-data-local: $(MKDIR_P) $(DESTDIR)$(controldir) diff --git a/plugins/kimchi/control/vm/Makefile.am b/plugins/kimchi/control/vm/Makefile.am index e57b907..b17c68a 100644 --- a/plugins/kimchi/control/vm/Makefile.am +++ b/plugins/kimchi/control/vm/Makefile.am @@ -20,7 +20,7 @@ vm_PYTHON = *.py -vmdir = $(pythondir)/kimchi/control/vm +vmdir = $(pythondir)/wok/plugins/kimchi/control/vm install-data-local: $(MKDIR_P) $(DESTDIR)$(vmdir) diff --git a/plugins/kimchi/docs/Makefile.am b/plugins/kimchi/docs/Makefile.am index 2f686f1..679aa18 100644 --- a/plugins/kimchi/docs/Makefile.am +++ b/plugins/kimchi/docs/Makefile.am @@ -25,7 +25,4 @@ dist_doc_DATA = \ README-federation.md \ kimchi-guest.png \ kimchi-templates.png \ - kimchid.8 \ $(NULL) - -CLEANFILES = kimchid.8 diff --git a/plugins/kimchi/model/Makefile.am b/plugins/kimchi/model/Makefile.am index a6ccbf0..f4f4750 100644 --- a/plugins/kimchi/model/Makefile.am +++ b/plugins/kimchi/model/Makefile.am @@ -19,7 +19,7 @@ model_PYTHON = *.py -modeldir = $(pythondir)/kimchi/model +modeldir = $(pythondir)/wok/plugins/kimchi/model install-data-local: $(MKDIR_P) $(DESTDIR)$(modeldir) diff --git a/plugins/kimchi/po/POTFILES.in b/plugins/kimchi/po/POTFILES.in index 57bc711..92eef1e 100644 --- a/plugins/kimchi/po/POTFILES.in +++ b/plugins/kimchi/po/POTFILES.in @@ -1,4 +1,3 @@ # List of source files which contain translatable strings. -src/kimchi/i18n.py +i18n.py ui/pages/*.tmpl -ui/pages/tabs/*.tmpl diff --git a/plugins/kimchi/tests/Makefile.am b/plugins/kimchi/tests/Makefile.am index 09dce6c..c1f6784 100644 --- a/plugins/kimchi/tests/Makefile.am +++ b/plugins/kimchi/tests/Makefile.am @@ -31,7 +31,7 @@ do_substitution = \ -e 's,[@]prefix[@],$(prefix),g' \ -e 's,[@]datadir[@],$(datadir),g' \ -e 's,[@]PYTHON_VERSION[@],$(PYTHON_VERSION),g' \ - -e 's,[@]kimchidir[@],$(pythondir)/kimchi,g' \ + -e 's,[@]wokdir[@],$(pythondir)/wok,g' \ -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' diff --git a/plugins/kimchi/ui/Makefile.am b/plugins/kimchi/ui/Makefile.am index 208d3e3..386aa78 100644 --- a/plugins/kimchi/ui/Makefile.am +++ b/plugins/kimchi/ui/Makefile.am @@ -15,4 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = ui +SUBDIRS = config css images js libs pages spice-html5 + +uidir = $(datadir)/wok/plugins/kimchi/ui diff --git a/plugins/kimchi/ui/config/Makefile.am b/plugins/kimchi/ui/config/Makefile.am index 32b74e3..e3b3d19 100644 --- a/plugins/kimchi/ui/config/Makefile.am +++ b/plugins/kimchi/ui/config/Makefile.am @@ -15,8 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -xmldir = $(datadir)/kimchi/config/ui +xmldir = $(datadir)/wok/plugins/kimchi/ui/config dist_xml_DATA = \ - tabs.xml \ + tab-ext.xml \ $(NULL) diff --git a/plugins/kimchi/ui/css/Makefile.am b/plugins/kimchi/ui/css/Makefile.am index f4f3dac..5071d29 100644 --- a/plugins/kimchi/ui/css/Makefile.am +++ b/plugins/kimchi/ui/css/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = theme-default -cssdir = $(datadir)/kimchi/ui/css +cssdir = $(datadir)/wok/plugins/kimchi/ui/css dist_css_DATA = theme-default.min.css theme-default.min.css: theme-default/*.css diff --git a/plugins/kimchi/ui/images/Makefile.am b/plugins/kimchi/ui/images/Makefile.am index 7b63d23..0562e6a 100644 --- a/plugins/kimchi/ui/images/Makefile.am +++ b/plugins/kimchi/ui/images/Makefile.am @@ -17,6 +17,6 @@ SUBDIRS = theme-default -imagedir = $(datadir)/kimchi/ui/images +imagedir = $(datadir)/wok/plugins/kimchi/ui/images dist_image_DATA = *.png *.ico diff --git a/plugins/kimchi/ui/images/theme-default/Makefile.am b/plugins/kimchi/ui/images/theme-default/Makefile.am index 7c69b2a..7e11d75 100644 --- a/plugins/kimchi/ui/images/theme-default/Makefile.am +++ b/plugins/kimchi/ui/images/theme-default/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -imagedir = $(datadir)/kimchi/ui/images/theme-default +imagedir = $(datadir)/wok/plugins/kimchi/ui/images/theme-default dist_image_DATA = *.png *.gif diff --git a/plugins/kimchi/ui/js/Makefile.am b/plugins/kimchi/ui/js/Makefile.am index d0653b9..50f5f77 100644 --- a/plugins/kimchi/ui/js/Makefile.am +++ b/plugins/kimchi/ui/js/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = src widgets -jsdir = $(datadir)/kimchi/ui/js +jsdir = $(datadir)/wok/plugins/kimchi/ui/js dist_js_DATA = kimchi.min.js $(filter-out kimchi.min.js, $(wildcard *.js)) diff --git a/plugins/kimchi/ui/libs/Makefile.am b/plugins/kimchi/ui/libs/Makefile.am index a2acce2..818c4ec 100644 --- a/plugins/kimchi/ui/libs/Makefile.am +++ b/plugins/kimchi/ui/libs/Makefile.am @@ -17,6 +17,6 @@ SUBDIRS = themes -jsdir = $(datadir)/kimchi/ui/libs +jsdir = $(datadir)/wok/plugins/kimchi/ui/libs dist_js_DATA = $(wildcard *.js) $(NULL) diff --git a/plugins/kimchi/ui/libs/themes/base/Makefile.am b/plugins/kimchi/ui/libs/themes/base/Makefile.am index d7454f0..70326ba 100644 --- a/plugins/kimchi/ui/libs/themes/base/Makefile.am +++ b/plugins/kimchi/ui/libs/themes/base/Makefile.am @@ -17,6 +17,6 @@ SUBDIRS = images -basedir = $(datadir)/kimchi/ui/libs/themes/base +basedir = $(datadir)/wok/plugins/kimchi/ui/libs/themes/base dist_base_DATA = $(wildcard *.css) $(NULL) diff --git a/plugins/kimchi/ui/libs/themes/base/images/Makefile.am b/plugins/kimchi/ui/libs/themes/base/images/Makefile.am index 312cbeb..e20b434 100644 --- a/plugins/kimchi/ui/libs/themes/base/images/Makefile.am +++ b/plugins/kimchi/ui/libs/themes/base/images/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -imagesdir = $(datadir)/kimchi/ui/libs/themes/base/images +imagesdir = $(datadir)/wok/plugins/kimchi/ui/libs/themes/base/images dist_images_DATA = *.png *.gif diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am index a22afc1..076b814 100644 --- a/plugins/kimchi/ui/pages/Makefile.am +++ b/plugins/kimchi/ui/pages/Makefile.am @@ -15,8 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = help tabs websockify +SUBDIRS = help tabs -htmldir = $(datadir)/kimchi/ui/pages +htmldir = $(datadir)/wok/plugins/kimchi/ui/pages dist_html_DATA = $(wildcard *.tmpl) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/Makefile.am b/plugins/kimchi/ui/pages/help/Makefile.am index 5c04319..0fbe47b 100644 --- a/plugins/kimchi/ui/pages/help/Makefile.am +++ b/plugins/kimchi/ui/pages/help/Makefile.am @@ -22,7 +22,7 @@ DITA_XSL_FILE = dita-help.xsl EXTRA_DIST = gen-index.py\ $(DITA_XSL_FILE) -helpdir = $(datadir)/kimchi/ui/pages/help +helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help dist_help_DATA = kimchi.css diff --git a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am index ab1c769..3d99aae 100644 --- a/plugins/kimchi/ui/pages/help/de_DE/Makefile.am +++ b/plugins/kimchi/ui/pages/help/de_DE/Makefile.am @@ -14,7 +14,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 -de_DE_helpdir = $(datadir)/kimchi/ui/pages/help/de_DE +de_DE_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/de_DE dist_de_DE_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/en_US/Makefile.am b/plugins/kimchi/ui/pages/help/en_US/Makefile.am index d5ab24f..d37f03a 100644 --- a/plugins/kimchi/ui/pages/help/en_US/Makefile.am +++ b/plugins/kimchi/ui/pages/help/en_US/Makefile.am @@ -14,7 +14,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 -en_US_helpdir = $(datadir)/kimchi/ui/pages/help/en_US +en_US_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/en_US dist_en_US_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am index a3317a6..29c596f 100644 --- a/plugins/kimchi/ui/pages/help/es_ES/Makefile.am +++ b/plugins/kimchi/ui/pages/help/es_ES/Makefile.am @@ -14,7 +14,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 -es_ES_helpdir = $(datadir)/kimchi/ui/pages/help/es_ES +es_ES_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/es_ES dist_es_ES_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am index a5eba5a..11ce394 100644 --- a/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am +++ b/plugins/kimchi/ui/pages/help/fr_FR/Makefile.am @@ -14,7 +14,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 -fr_FR_helpdir = $(datadir)/kimchi/ui/pages/help/fr_FR +fr_FR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/fr_FR dist_fr_FR_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am index c828f26..62e2f29 100644 --- a/plugins/kimchi/ui/pages/help/it_IT/Makefile.am +++ b/plugins/kimchi/ui/pages/help/it_IT/Makefile.am @@ -14,7 +14,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 -it_IT_helpdir = $(datadir)/kimchi/ui/pages/help/it_IT +it_IT_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/it_IT dist_it_IT_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am index a7d6464..f9c2f33 100644 --- a/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am +++ b/plugins/kimchi/ui/pages/help/ja_JP/Makefile.am @@ -14,7 +14,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 -ja_JP_helpdir = $(datadir)/kimchi/ui/pages/help/ja_JP +ja_JP_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ja_JP dist_ja_JP_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am index 3242ad7..e441955 100644 --- a/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am +++ b/plugins/kimchi/ui/pages/help/ko_KR/Makefile.am @@ -14,7 +14,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 -ko_KR_helpdir = $(datadir)/kimchi/ui/pages/help/ko_KR +ko_KR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ko_KR dist_ko_KR_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am index 0f1df92..7fc2cb0 100644 --- a/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am +++ b/plugins/kimchi/ui/pages/help/pt_BR/Makefile.am @@ -14,7 +14,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 -pt_BR_helpdir = $(datadir)/kimchi/ui/pages/help/pt_BR +pt_BR_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/pt_BR dist_pt_BR_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am index b128c6d..85ca27a 100644 --- a/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am +++ b/plugins/kimchi/ui/pages/help/ru_RU/Makefile.am @@ -14,7 +14,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 -ru_RU_helpdir = $(datadir)/kimchi/ui/pages/help/ru_RU +ru_RU_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/ru_RU dist_ru_RU_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am index 8b812ff..e785048 100644 --- a/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am +++ b/plugins/kimchi/ui/pages/help/zh_CN/Makefile.am @@ -14,7 +14,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 -zh_CN_helpdir = $(datadir)/kimchi/ui/pages/help/zh_CN +zh_CN_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/zh_CN dist_zh_CN_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am index 911d737..9c8ac26 100644 --- a/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am +++ b/plugins/kimchi/ui/pages/help/zh_TW/Makefile.am @@ -14,7 +14,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 -zh_TW_helpdir = $(datadir)/kimchi/ui/pages/help/zh_TW +zh_TW_helpdir = $(datadir)/wok/plugins/kimchi/ui/pages/help/zh_TW dist_zh_TW_help_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/pages/tabs/Makefile.am b/plugins/kimchi/ui/pages/tabs/Makefile.am index a29df7e..4d5d33e 100644 --- a/plugins/kimchi/ui/pages/tabs/Makefile.am +++ b/plugins/kimchi/ui/pages/tabs/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -tabshtmldir = $(datadir)/kimchi/ui/pages/tabs +tabshtmldir = $(datadir)/wok/plugins/kimchi/ui/pages/tabs dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL) diff --git a/plugins/kimchi/ui/spice-html5/Makefile.am b/plugins/kimchi/ui/spice-html5/Makefile.am index 3a6558a..c43f1ef 100644 --- a/plugins/kimchi/ui/spice-html5/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/Makefile.am @@ -20,6 +20,6 @@ SUBDIRS = pages if WITH_SPICE SUBDIRS += css thirdparty -spicehtml5dir = $(datadir)/kimchi/ui/spice-html5 +spicehtml5dir = $(datadir)/wok/plugins/kimchi/ui/spice-html5 dist_spicehtml5_DATA = $(wildcard *.js) $(NULL) endif diff --git a/plugins/kimchi/ui/spice-html5/css/Makefile.am b/plugins/kimchi/ui/spice-html5/css/Makefile.am index 6106e0d..ed51972 100644 --- a/plugins/kimchi/ui/spice-html5/css/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/css/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -spicecssdir = $(datadir)/kimchi/ui/spice-html5 +spicecssdir = $(datadir)/wok/plugins/kimchi/ui/spice-html5 dist_spicecss_DATA = $(wildcard *.css) $(NULL) diff --git a/plugins/kimchi/ui/spice-html5/pages/Makefile.am b/plugins/kimchi/ui/spice-html5/pages/Makefile.am index 45e67a5..431ec6c 100644 --- a/plugins/kimchi/ui/spice-html5/pages/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/pages/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -spicepagesdir = $(datadir)/kimchi/ui/spice-html5/pages +spicepagesdir = $(datadir)/wok/plugins/kimchi/ui/spice-html5/pages dist_spicepages_DATA = $(wildcard *.html) $(NULL) diff --git a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am index b83a585..474478d 100644 --- a/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am +++ b/plugins/kimchi/ui/spice-html5/thirdparty/Makefile.am @@ -15,6 +15,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -thirdpartydir = $(datadir)/kimchi/ui/spice-html5/thirdparty +thirdpartydir = $(datadir)/wok/plugins/kimchi/ui/spice-html5/thirdparty dist_thirdparty_DATA = $(wildcard *.js) $(NULL) diff --git a/plugins/kimchi/xmlutils/Makefile.am b/plugins/kimchi/xmlutils/Makefile.am index 73f86f4..207ad7f 100644 --- a/plugins/kimchi/xmlutils/Makefile.am +++ b/plugins/kimchi/xmlutils/Makefile.am @@ -19,7 +19,7 @@ xmlutils_PYTHON = *.py -xmlutilsdir = $(pythondir)/kimchi/xmlutils +xmlutilsdir = $(pythondir)/wok/plugins/kimchi/xmlutils install-data-local: $(MKDIR_P) $(DESTDIR)$(xmlutilsdir) -- 1.7.1