Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: build: use proper vars in install-dev
......................................................................
packaging: build: use proper vars in install-dev
Change-Id: I01fe6552dfde6716bbcfdc65cb14afc08731aad6
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile
1 file changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/16889/1
diff --git a/Makefile b/Makefile
index a14e813..109fee5 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,6 @@
PYTHON=python
PREFIX=/usr/local
LOCALSTATE_DIR=$(PREFIX)/var
-ENGINE_STATE=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME)
BIN_DIR=$(PREFIX)/bin
PID_DIR=$(LOCALSTATE_DIR)/run
SYSCONF_DIR=$(PREFIX)/etc
@@ -61,6 +60,7 @@
PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/$(ENGINE_NAME)
PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/$(ENGINE_NAME)
PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME)
+PKG_STATE_DIR=$(LOCALSTATE_DIR)/lib/$(ENGINE_NAME)
SPICE_DIR=/usr/share/spice
JBOSS_HOME=/usr/share/jboss-as
PYTHON_DIR=$(PYTHON_SYS_DIR)
@@ -139,7 +139,7 @@
-e "s|@ENGINE_TMP@|$(PKG_TMP_DIR)|g" \
-e "s|@ENGINE_USR@|$(DATA_DIR)|g" \
-e "s|@ENGINE_DOC@|$(PKG_DOC_DIR)|g" \
- -e "s|@ENGINE_VAR@|$(ENGINE_STATE)|g" \
+ -e "s|@ENGINE_VAR@|$(PKG_STATE_DIR)|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" \
@@ -366,7 +366,7 @@
install -d -m 755 "$(DESTDIR)$(PKG_PKI_DIR)/requests"
install -d -m 755 "$(DESTDIR)$(DATA_DIR)/ui-plugins"
install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/branding"
- install -d -m 750 "$(DESTDIR)$(ENGINE_STATE)/backups"
+ install -d -m 750 "$(DESTDIR)$(PKG_STATE_DIR)/backups"
install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/branding"
-rm -f "$(DESTDIR)$(PKG_SYSCONF_DIR)/branding/00-ovirt.brand"
@@ -437,12 +437,11 @@
EXTRA_BUILD_FLAGS="$(DEV_BUILD_FLAGS)" \
PYTHON_DIR="$(PREFIX)$(PYTHON_SYS_DIR)" \
$(NULL)
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/tmp"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/run/notifier"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/cache/ovirt-engine"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/lib/ovirt-engine/backups"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/lib/ovirt-engine/deployments"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/lib/ovirt-engine/content"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/log/ovirt-engine/host-deploy"
- install -d "$(DESTDIR)$(LOCALSTATE_DIR)/log/ovirt-engine/notifier"
- install -d
"$(DESTDIR)$(LOCALSTATE_DIR)/log/ovirt-engine/engine-manage-domains"
+
+ install -d "$(DESTDIR)$(PKG_TMP_DIR)"
+ install -d "$(DESTDIR)$(PKG_CACHE_DIR)"
+ install -d "$(DESTDIR)$(PKG_STATE_DIR)/deployments"
+ install -d "$(DESTDIR)$(PKG_STATE_DIR)/content"
+ install -d "$(DESTDIR)$(PKG_LOG_DIR)/host-deploy"
+ install -d "$(DESTDIR)$(PKG_LOG_DIR)/notifier"
+ install -d "$(DESTDIR)$(PKG_LOG_DIR)/engine-manage-domains"
--
To view, visit http://gerrit.ovirt.org/16889
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01fe6552dfde6716bbcfdc65cb14afc08731aad6
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
