Project

General

Profile

« Previous | Next » 

Revision 7572

root Makefile: MySQL: Renamed *mysql_user to *mysql_users because there can be multiple users

View differences:

Makefile
271 271

  
272 272
##### MySQL
273 273

  
274
mysql: _always $(call forOs,mysql) mysql_user
274
mysql: _always $(call forOs,mysql) mysql_users
275 275
	@$(done)
276 276

  
277
rm_mysql: _always rm_mysql_user ;
277
rm_mysql: _always rm_mysql_users ;
278 278

  
279 279
mysql-Linux: _always
280 280
	@echo $(emph)"If asked for MySQL root password, enter $(bienPassword)"$(endEmph)
......
302 302

  
303 303
mysqlAsRoot := mysql --user=root --password='$(bienPassword)'
304 304

  
305
mysql_user: _always
305
mysql_users: _always
306 306
	-$($@_cmd)
307 307
# ignore errors if user exists
308
mysql_user_cmd = echo "CREATE USER 'bien'@'localhost' IDENTIFIED BY \
308
mysql_users_cmd = echo "CREATE USER 'bien'@'localhost' IDENTIFIED BY \
309 309
'$(bienPassword)';"|$(mysqlAsRoot)
310 310

  
311
rm_mysql_user: _always
311
rm_mysql_users: _always
312 312
	-echo "DROP USER 'bien'@'localhost';"|$(mysqlAsRoot)
313 313
# ignore errors if user exists
314 314

  

Also available in: Unified diff