Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
lerwys committed Jul 1, 2020
2 parents ea52e2b + 24f8574 commit d7ff779
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ for project in libsodium libzmq czmq; do
CONFIG_OPTS+=("CFLAGS=-Wno-format-truncation")
CONFIG_OPTS+=("CPPFLAGS=-Wno-format-truncation")
if [ $project == "libzmq" ]; then
CONFIG_OPTS+=("--with-libsodium")
CONFIG_OPTS+=("PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --with-libsodium")
fi

cd $project && \
Expand Down
2 changes: 1 addition & 1 deletion doc/halcs-installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ following snippet:
CONFIG_OPTS+=("CFLAGS=-Wno-format-truncation")
CONFIG_OPTS+=("CPPFLAGS=-Wno-format-truncation")
if [ $project == "libzmq" ]; then
CONFIG_OPTS+=("--with-libsodium")
CONFIG_OPTS+=("PKG_CONFIG_PATH=/usr/local/lib/pkgconfig --with-libsodium")
fi
cd $project && \
Expand Down

0 comments on commit d7ff779

Please sign in to comment.