Browse Source

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 .
ENGINE-198
Damiano Boppart 5 years ago
parent
commit
c528ed7b7d
2 changed files with 5 additions and 4 deletions
  1. +2
    -1
      Makefile.conf
  2. +3
    -3
      sync/Makefile

+ 2
- 1
Makefile.conf View File

@ -10,10 +10,11 @@ LD=$(CC)
SYSTEM_DB=/usr/local/share/pEp/system.db
PREFIX=$(HOME)
YML2PROC=$(HOME)/yml2/yml2proc
YML_OPTS=--encoding=utf8
YML_PATH=$(HOME)/yml2
ASN1C=asn1c
ASN1C_INCLUDE=/opt/local/share/asn1c
#LIBGPGME=/opt/local/lib/libgpgme-pthread.11.dylib
LIBGPGME=/opt/local/lib/libgpgme.11.dylib
# C makros (not environment variables) to overwrite:
#


+ 3
- 3
sync/Makefile View File

@ -13,10 +13,10 @@ skeleton: .actions
touch .codegen
.actions: devicegroup.fsm gen_actions.ysl2 fsm.yml2 functions.ysl2
$(YML2PROC) -y gen_actions.ysl2 $< -o $@
$(YML2PROC) $(YML_OPTS) -y gen_actions.ysl2 $< -o $@
.statemachines: devicegroup.fsm gen_statemachine.ysl2 fsm.yml2 functions.ysl2
$(YML2PROC) -y gen_statemachine.ysl2 $< -o $@
$(YML2PROC) $(YML_OPTS) -y gen_statemachine.ysl2 $< -o $@
.PHONY: clean
@ -29,7 +29,7 @@ clean:
yml2c $< -o $@
%.dot: devicegroup.fsm gen_dot.ysl2
yml2proc -y gen_dot.ysl2 $<
$(YML2PROC) $(YML_OPTS) -y gen_dot.ysl2 $<
%.svg: %.dot
dot -Tsvg -o $@ $<

Loading…
Cancel
Save