From 64f2b2ad95684d871034a14c5af9a0650660db2b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 Jan 2016 21:13:17 +0300 Subject: Add support for multiple help index files. --- data/help/CMakeLists.txt | 3 +-- data/help/Makefile.am | 3 +-- data/help/idx/CMakeLists.txt | 5 +++++ data/help/idx/Makefile.am | 8 ++++++++ data/help/idx/tags.idx | 15 +++++++++++++++ data/help/tags.idx | 15 --------------- 6 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 data/help/idx/CMakeLists.txt create mode 100644 data/help/idx/Makefile.am create mode 100644 data/help/idx/tags.idx delete mode 100644 data/help/tags.idx (limited to 'data') diff --git a/data/help/CMakeLists.txt b/data/help/CMakeLists.txt index 60cf9a458..aae5b480e 100644 --- a/data/help/CMakeLists.txt +++ b/data/help/CMakeLists.txt @@ -14,11 +14,10 @@ SET(FILES searchnotfound.txt skills.txt support.txt - tags.idx team.txt windows.txt ) -ADD_SUBDIRECTORY(tips) +ADD_SUBDIRECTORY(idx tips) INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help) diff --git a/data/help/Makefile.am b/data/help/Makefile.am index b83c4830b..929228dc5 100644 --- a/data/help/Makefile.am +++ b/data/help/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tips +SUBDIRS = idx tips helpdir = $(pkgdatadir)/data/help @@ -18,7 +18,6 @@ help_DATA = \ searchnotfound.txt \ skills.txt \ support.txt \ - tags.idx \ team.txt \ windows.txt diff --git a/data/help/idx/CMakeLists.txt b/data/help/idx/CMakeLists.txt new file mode 100644 index 000000000..321eb8318 --- /dev/null +++ b/data/help/idx/CMakeLists.txt @@ -0,0 +1,5 @@ +SET(FILES + tags.idx + ) + +INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/help/idx) diff --git a/data/help/idx/Makefile.am b/data/help/idx/Makefile.am new file mode 100644 index 000000000..001e68707 --- /dev/null +++ b/data/help/idx/Makefile.am @@ -0,0 +1,8 @@ +idxdir = $(pkgdatadir)/data/help/idx + +idx_DATA = \ + tags.idx + +EXTRA_DIST = \ + $(idx_DATA) \ + CMakeLists.txt diff --git a/data/help/idx/tags.idx b/data/help/idx/tags.idx new file mode 100644 index 000000000..12f3d8477 --- /dev/null +++ b/data/help/idx/tags.idx @@ -0,0 +1,15 @@ +about|about +about|about manaplus +about|manaplus about +about|manaplus +chatcommands|chat +chatcommands|commands +chatcommands|chat commands +chatcommands|chat command +skills|skills +index|index +team|team +tips/12|warp +tips/12|warps +tips/16|download +tips/16|downloads diff --git a/data/help/tags.idx b/data/help/tags.idx deleted file mode 100644 index 12f3d8477..000000000 --- a/data/help/tags.idx +++ /dev/null @@ -1,15 +0,0 @@ -about|about -about|about manaplus -about|manaplus about -about|manaplus -chatcommands|chat -chatcommands|commands -chatcommands|chat commands -chatcommands|chat command -skills|skills -index|index -team|team -tips/12|warp -tips/12|warps -tips/16|download -tips/16|downloads -- cgit v1.2.3-60-g2f50