Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: build: support subst more than once in line
......................................................................
packaging: build: support subst more than once in line
Change-Id: Ie91ea6bb2765825c022ba699ddf1d7660298265f
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile
1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/13630/1
diff --git a/Makefile b/Makefile
index 4a8ac16..0af985c 100644
--- a/Makefile
+++ b/Makefile
@@ -98,22 +98,22 @@
# Rule to generate files from templates:
.in:
sed \
- -e "s|@ENGINE_DEFAULTS@|$(DATA_DIR)/conf/engine.conf.defaults|" \
- -e "s|@ENGINE_VARS@|$(PKG_SYSCONF_DIR)/engine.conf|" \
- -e "s|@ENGINE_USER@|$(PKG_USER)|" \
- -e "s|@ENGINE_GROUP@|$(PKG_GROUP)|" \
- -e "s|@ENGINE_ETC@|$(PKG_SYSCONF_DIR)|" \
- -e "s|@ENGINE_PKI@|$(PKG_PKI_DIR)|" \
- -e "s|@ENGINE_LOG@|$(PKG_LOG_DIR)|" \
- -e "s|@ENGINE_TMP@|$(PKG_TMP_DIR)|" \
- -e "s|@ENGINE_USR@|$(DATA_DIR)|" \
- -e "s|@ENGINE_VAR@|$(ENGINE_STATE)|" \
- -e "s|@ENGINE_CACHE@|$(PKG_CACHE_DIR)|" \
- -e "s|@ENGINE_PID@|$(PID_DIR)/$(ENGINE_NAME).pid|" \
- -e "s|@RPM_VERSION@|$(RPM_VERSION)|" \
- -e "s|@RPM_RELEASE@|$(RPM_RELEASE)|" \
- -e "s|@PACKAGE_NAME@|$(PACKAGE_NAME)|" \
- -e "s|@PACKAGE_VERSION@|$(PACKAGE_VERSION)|" \
+ -e "s|@ENGINE_DEFAULTS@|$(DATA_DIR)/conf/engine.conf.defaults|g" \
+ -e "s|@ENGINE_VARS@|$(PKG_SYSCONF_DIR)/engine.conf|g" \
+ -e "s|@ENGINE_USER@|$(PKG_USER)|g" \
+ -e "s|@ENGINE_GROUP@|$(PKG_GROUP)|g" \
+ -e "s|@ENGINE_ETC@|$(PKG_SYSCONF_DIR)|g" \
+ -e "s|@ENGINE_PKI@|$(PKG_PKI_DIR)|g" \
+ -e "s|@ENGINE_LOG@|$(PKG_LOG_DIR)|g" \
+ -e "s|@ENGINE_TMP@|$(PKG_TMP_DIR)|g" \
+ -e "s|@ENGINE_USR@|$(DATA_DIR)|g" \
+ -e "s|@ENGINE_VAR@|$(ENGINE_STATE)|g" \
+ -e "s|@ENGINE_CACHE@|$(PKG_CACHE_DIR)|g" \
+ -e "s|@ENGINE_PID@|$(PID_DIR)/$(ENGINE_NAME).pid|g" \
+ -e "s|@RPM_VERSION@|$(RPM_VERSION)|g" \
+ -e "s|@RPM_RELEASE@|$(RPM_RELEASE)|g" \
+ -e "s|@PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
+ -e "s|@PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
$< > $@
# List of files that will be generated from templates:
--
To view, visit http://gerrit.ovirt.org/13630
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie91ea6bb2765825c022ba699ddf1d7660298265f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
