From 749476c4ca870507d9e349f6d12146b4b50d5003 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Wed, 19 Dec 2018 23:59:32 +0100
Subject: [PATCH] BUG: make file envar expansion

---
 makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/makefile b/makefile
index 6717454..a505f77 100644
--- a/makefile
+++ b/makefile
@@ -23,15 +23,15 @@
 SHELL=/bin/bash
 
 include .config
-M_MYSQL_USER=$(patsubst "%", %, $(MYSQL_USER))
-M_MYSQL_USER_PASSWORD=$(patsubst "%", %, $(MYSQL_USER_PASSWORD))
-M_LOGIN_PATH=$(patsubst "%", %, $(LOGIN_PATH))
-M_DATABASE_NAME=$(patsubst "%", %, $(DATABASE_NAME))
-M_DATABASE_USER_HOST_LIST=$(patsubst "%", %, $(DATABASE_USER_HOST_LIST))
-M_DATABASE_USER=$(patsubst "%", %, $(DATABASE_USER))
-M_MYSQL_CMD=$(patsubst "%", %, $(MYSQL_CMD))
-M_MYSQLDUMP_CMD=$(patsubst "%", %, $(MYSQLDUMP_CMD))
-M_MYSQLADMIN_CMD=$(patsubst "%", %, $(MYSQLADMIN_CMD))
+M_MYSQL_USER=$(shell echo $(MYSQL_USER))
+M_MYSQL_USER_PASSWORD=$(shell echo $(MYSQL_USER_PASSWORD))
+M_LOGIN_PATH=$(shell echo $(LOGIN_PATH))
+M_DATABASE_NAME=$(shell echo $(DATABASE_NAME))
+M_DATABASE_USER_HOST_LIST=$(shell echo $(DATABASE_USER_HOST_LIST))
+M_DATABASE_USER=$(shell echo $(DATABASE_USER))
+M_MYSQL_CMD=$(shell echo $(MYSQL_CMD))
+M_MYSQLDUMP_CMD=$(shell echo $(MYSQLDUMP_CMD))
+M_MYSQLADMIN_CMD=$(shell echo $(MYSQLADMIN_CMD))
 
 INSTALL_SQL_FILE=db_2_0.sql
 ifdef LOGIN_PATH
-- 
GitLab