aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael G. Martins <rafael@rafaelmartins.eng.br>2015-12-25 23:52:19 +0100
committerRafael G. Martins <rafael@rafaelmartins.eng.br>2015-12-25 23:52:19 +0100
commit008c96d6518125f2683c1b4e842ca3ed6e865c3d (patch)
tree4927867f82c2ad34d2dc957233af679fb6220faa
parent38fe0a8d151e681e4818f9afceb5188470fc0636 (diff)
parent14e9d7b2299f15efb695b0202f9c1f6a9f7a4ba6 (diff)
downloadblogc-008c96d6518125f2683c1b4e842ca3ed6e865c3d.tar.gz
blogc-008c96d6518125f2683c1b4e842ca3ed6e865c3d.tar.bz2
blogc-008c96d6518125f2683c1b4e842ca3ed6e865c3d.zip
Merge remote-tracking branch 'origin/master' into feature/directives
-rw-r--r--Makefile.am15
-rw-r--r--configure.ac6
-rw-r--r--src/main.c3
3 files changed, 20 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 4e79863..65b6c36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -120,7 +120,15 @@ blogc.1: man/blogc.1.ronn
--manual "$(PACKAGE_NAME) Manual" \
$< > $@
-blogc%.7: man/blogc%.7.ronn
+blogc-source.7: man/blogc-source.7.ronn
+ $(AM_V_GEN)$(RONN) \
+ --roff \
+ --pipe \
+ --organization "Rafael G. Martins" \
+ --manual "$(PACKAGE_NAME) Manual" \
+ $< > $@
+
+blogc-template.7: man/blogc-template.7.ronn
$(AM_V_GEN)$(RONN) \
--roff \
--pipe \
@@ -133,7 +141,10 @@ else
blogc.1:
$(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1
-blogc%.7:
+blogc-source.7:
+ $(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1
+
+blogc-template.7:
$(AM_V_GEN)echo "error: ronn not found. failed to build man page: $@"; exit 1
endif
diff --git a/configure.ac b/configure.ac
index 4a5c4a7..3cfb07d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,18 @@
AC_PREREQ([2.69])
-AC_INIT([blogc], [0.5], [https://github.com/blogc/blogc], [blogc], [https://blogc.rgm.io])
+AC_INIT([blogc], [0.5.1], [https://github.com/blogc/blogc], [blogc], [https://blogc.rgm.io])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.13 foreign dist-bzip2 dist-xz dist-zip subdir-objects serial-tests])
+AM_INIT_AUTOMAKE([1.13 foreign dist-bzip2 dist-xz dist-zip subdir-objects serial-tests -Wall -Werror])
AC_CONFIG_HEADERS([config.h])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE([enable])
AC_USE_SYSTEM_EXTENSIONS
+AM_PROG_AR
+
LT_INIT
AC_PROG_CC_C99
diff --git a/src/main.c b/src/main.c
index d6fa595..600a131 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,6 +19,7 @@
#endif /* HAVE_SYS_TYPES_H */
#include <errno.h>
+#include <locale.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
@@ -105,6 +106,8 @@ blogc_mkdir_recursive(const char *filename)
int
main(int argc, char **argv)
{
+ setlocale(LC_ALL, "");
+
int rv = 0;
bool listing = false;