Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpx/lua-cjson.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2016-08-24 16:01:55 +0300
committerMark Pulford <mark@kyne.com.au>2016-08-24 16:01:55 +0300
commit1f3857a0785c1490c7ed23bfaf745b750b84683a (patch)
tree4b9fc72dfacfb9666583b9cb5258b6b54baa17ac
parentbb8472269063a8e9b7abd95f414cc957a51c15ec (diff)
Use more common adoc extension for AsciiDoc
-rw-r--r--Makefile4
-rwxr-xr-xbuild-packages.sh2
-rw-r--r--lua-cjson.spec2
-rw-r--r--manual.adoc (renamed from manual.txt)0
-rw-r--r--performance.adoc (renamed from performance.txt)0
5 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e753472..63f84a0 100644
--- a/Makefile
+++ b/Makefile
@@ -84,12 +84,12 @@ OBJS = lua_cjson.o strbuf.o $(FPCONV_OBJS)
.PHONY: all clean install install-extra doc
-.SUFFIXES: .html .txt
+.SUFFIXES: .html .adoc
.c.o:
$(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $<
-.txt.html:
+.adoc.html:
$(ASCIIDOC) -n -a toc $<
all: $(TARGET)
diff --git a/build-packages.sh b/build-packages.sh
index 23a6f2e..2c45e66 100755
--- a/build-packages.sh
+++ b/build-packages.sh
@@ -5,7 +5,7 @@
# Build packages. Use current checked out version, or a specific tag/commit.
# Files requiring a version bump
-VERSION_FILES="lua-cjson-2.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.txt runtests.sh tests/test.lua"
+VERSION_FILES="lua-cjson-2.1devel-1.rockspec lua-cjson.spec lua_cjson.c manual.adoc runtests.sh tests/test.lua"
[ "$1" ] && BRANCH="$1" || BRANCH="`git describe --match '[1-3].[0-9]*'`"
VERSION="`git describe --match '[1-3].[0-9]*' $BRANCH`"
diff --git a/lua-cjson.spec b/lua-cjson.spec
index 13fc56d..3d3cb16 100644
--- a/lua-cjson.spec
+++ b/lua-cjson.spec
@@ -50,7 +50,7 @@ rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root,-)
-%doc LICENSE NEWS performance.html performance.txt manual.html manual.txt rfc4627.txt THANKS
+%doc LICENSE NEWS performance.html performance.adoc manual.html manual.adoc rfc4627.txt THANKS
%{lualibdir}/*
%{luadatadir}/*
%{_bindir}/*
diff --git a/manual.txt b/manual.adoc
index 0667736..0667736 100644
--- a/manual.txt
+++ b/manual.adoc
diff --git a/performance.txt b/performance.adoc
index a36412d..a36412d 100644
--- a/performance.txt
+++ b/performance.adoc