From b8330dce076ad91a3dbdce0b7938f61dad9c0da3 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 29 Mar 2016 14:53:51 +0200 Subject: [PATCH] Fix deployment Makefile goal The virtual environment virtual directory wasn't set properly for deployment. Fixes #21 --- Makefile.global | 11 ++++++----- src/pg/Makefile | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.global b/Makefile.global index 77f6c69..504886f 100644 --- a/Makefile.global +++ b/Makefile.global @@ -1,6 +1,7 @@ SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) -EXTENSION = crankshaft -PACKAGE = crankshaft -EXTVERSION = $(shell grep default_version $(SELF_DIR)/src/pg/$(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") -RELEASE_VERSION ?= $(EXTVERSION) -SED = sed +EXTENSION = crankshaft +PACKAGE = crankshaft +EXTVERSION = $(shell grep default_version $(SELF_DIR)/src/pg/$(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") +RELEASE_VERSION ?= $(EXTVERSION) +SED = sed +VIRTUALENV_PATH := $(realpath $(SELF_DIR)/envs) diff --git a/src/pg/Makefile b/src/pg/Makefile index 8a745c4..f4a34a2 100644 --- a/src/pg/Makefile +++ b/src/pg/Makefile @@ -18,7 +18,6 @@ DATA = $(EXTENSION)--dev.sql \ SOURCES_DATA_DIR = sql SOURCES_DATA = $(wildcard $(SOURCES_DATA_DIR)/*.sql) -VIRTUALENV_PATH = $(realpath ../../envs) ESC_VIRVIRTUALENV_PATH = $(subst /,\/,$(VIRTUALENV_PATH)) REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' \