Fix build error when LANG is not set
authorDamiano Boppart
Wed, 29 Mar 2017 17:06:27 +0200
changeset 170650fb48684347
parent 1705 697e89bdf6e9
child 1707 6c6e4315ba6f
Fix build error when LANG is not set

yml2proc file encoding now defaults to utf-8. Can be adjusted with a variable in Makefile.conf .
Makefile.conf
sync/Makefile
     1.1 --- a/Makefile.conf	Tue Mar 28 14:54:52 2017 +0200
     1.2 +++ b/Makefile.conf	Wed Mar 29 17:06:27 2017 +0200
     1.3 @@ -10,10 +10,11 @@
     1.4  SYSTEM_DB=/usr/local/share/pEp/system.db
     1.5  PREFIX=$(HOME)
     1.6  YML2PROC=$(HOME)/yml2/yml2proc
     1.7 +YML_OPTS=--encoding=utf8
     1.8  YML_PATH=$(HOME)/yml2
     1.9  ASN1C=asn1c
    1.10  ASN1C_INCLUDE=/opt/local/share/asn1c
    1.11 -#LIBGPGME=/opt/local/lib/libgpgme-pthread.11.dylib
    1.12 +LIBGPGME=/opt/local/lib/libgpgme.11.dylib
    1.13  
    1.14  # C makros (not environment variables) to overwrite:
    1.15  #
     2.1 --- a/sync/Makefile	Tue Mar 28 14:54:52 2017 +0200
     2.2 +++ b/sync/Makefile	Wed Mar 29 17:06:27 2017 +0200
     2.3 @@ -13,10 +13,10 @@
     2.4  	touch .codegen
     2.5  
     2.6  .actions: devicegroup.fsm gen_actions.ysl2 fsm.yml2 functions.ysl2
     2.7 -	$(YML2PROC) -y gen_actions.ysl2 $< -o $@
     2.8 +	$(YML2PROC) $(YML_OPTS) -y gen_actions.ysl2 $< -o $@
     2.9  
    2.10  .statemachines: devicegroup.fsm gen_statemachine.ysl2 fsm.yml2 functions.ysl2
    2.11 -	$(YML2PROC) -y gen_statemachine.ysl2 $< -o $@
    2.12 +	$(YML2PROC) $(YML_OPTS) -y gen_statemachine.ysl2 $< -o $@
    2.13  
    2.14  .PHONY: clean
    2.15  
    2.16 @@ -29,7 +29,7 @@
    2.17  	yml2c $< -o $@
    2.18  
    2.19  %.dot: devicegroup.fsm gen_dot.ysl2
    2.20 -	yml2proc -y gen_dot.ysl2 $<
    2.21 +	$(YML2PROC) $(YML_OPTS) -y gen_dot.ysl2 $<
    2.22  
    2.23  %.svg: %.dot
    2.24  	dot -Tsvg -o $@ $<