Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: moving templates in their own dir ......................................................................
packaging: moving templates in their own dir moving templates sources in their own directory. Change-Id: Ic6e165fa70e32ef942281f5a90542891d646a844 Signed-off-by: Sandro Bonazzola <[email protected]> --- M Makefile.am M configure.ac A templates/Makefile.am R templates/hosted-engine.conf.in R templates/vm.conf.in 5 files changed, 30 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-hosted-engine-setup refs/changes/76/16876/1 diff --git a/Makefile.am b/Makefile.am index 992b273..fd851c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,6 +45,7 @@ build \ po \ src \ + templates \ tests \ $(NULL) @@ -54,12 +55,6 @@ dist_noinst_SCRIPTS = \ autogen.sh \ - $(NULL) - -templatesdir=$(ovirthostedenginetemplatedir) -dist_templates_DATA = \ - vm.conf.in \ - hosted-engine.conf.in $(NULL) TMPREPOS = tmp.repos diff --git a/configure.ac b/configure.ac index f42a0e7..85be110 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ src/plugins/ovirt-hosted-engine-setup/vdsmd/Makefile src/plugins/ovirt-hosted-engine-setup/engine/Makefile src/vdsm_hooks/Makefile + templates/Makefile tests/Makefile ]) AC_OUTPUT diff --git a/templates/Makefile.am b/templates/Makefile.am new file mode 100644 index 0000000..a016285 --- /dev/null +++ b/templates/Makefile.am @@ -0,0 +1,28 @@ +# +# ovirt-hosted-engine-setup -- ovirt hosted engine setup +# Copyright (C) 2013 Red Hat, Inc. +# +# 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 +# + +MAINTAINERCLEANFILES = \ + $(srcdir)/Makefile.in \ + $(NULL) + +templatesdir=$(ovirthostedenginetemplatedir) +dist_templates_DATA = \ + vm.conf.in \ + hosted-engine.conf.in + $(NULL) diff --git a/hosted-engine.conf.in b/templates/hosted-engine.conf.in similarity index 100% rename from hosted-engine.conf.in rename to templates/hosted-engine.conf.in diff --git a/vm.conf.in b/templates/vm.conf.in similarity index 100% rename from vm.conf.in rename to templates/vm.conf.in -- To view, visit http://gerrit.ovirt.org/16876 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6e165fa70e32ef942281f5a90542891d646a844 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-hosted-engine-setup Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
