Merge pull request #158 from tetengo/readme_install

Readme install (cherry picked from commit 01222c6)
tetengo · Jun 26, 2021 · dc44aa9 · dc44aa9
1 parent adfcf37
commit dc44aa9
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 21 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -19,30 +19,38 @@ SUBDIRS = \
     docsrc \
     precompiled
 
+data_files = \
+    COPYING \
+    README.md
+
 EXTRA_DIST = \
+    ${data_files} \
     bootstrap.sh \
     Doxyfile \
-    README.md \
     tetengo.sln \
     tetengo.setup.sln
 
 
+nobase_pkgdata_DATA = \
+    ${data_files}
+
+
 .PHONY: precompiled_h
 precompiled_h:
-	cd $(top_srcdir) && ./kogyan/tool/make_precompiled_h.py
+	cd ${top_srcdir} && ./kogyan/tool/make_precompiled_h.py
 
 .PHONY: doc
 doc:
-	cd $(top_srcdir) && $(DOXYGEN) Doxyfile
-	if test "$(top_srcdir)" != "$(top_builddir)"; \
+	cd ${top_srcdir} && ${DOXYGEN} Doxyfile
+	if test "${top_srcdir}" != "${top_builddir}"; \
 	then \
-	    rm -rf $(top_builddir)/doc; \
-	    mv $(top_srcdir)/doc $(top_builddir); \
+	    rm -rf ${top_builddir}/doc; \
+	    mv ${top_srcdir}/doc ${top_builddir}; \
 	fi
 
 .PHONY: clean-doc
 clean-doc:
-	-rm -rf $(top_builddir)/doc
+	-rm -rf ${top_builddir}/doc
 
 distclean-local: clean-doc
 
@@ -53,7 +61,7 @@ clean-iwyu: ${SOURCE_SUBDIRS}
 
 .PHONY: check_file_name_lengths
 check_file_name_lengths:
-	cd $(top_srcdir) && ./kogyan/tool/check_file_name_lengths.py
+	cd ${top_srcdir} && ./kogyan/tool/check_file_name_lengths.py
 
 mypy: ${SCRIPT_SUBDIRS}
 

diff --git a/executable/setup/res/Makefile.am b/executable/setup/res/Makefile.am
@@ -8,4 +8,4 @@ resource_files = \
     setup.rc
 
 EXTRA_DIST = \
-    $(resource_files)
+    ${resource_files}
diff --git a/executable/setup/src/Makefile.am b/executable/setup/src/Makefile.am
@@ -7,7 +7,8 @@ sources = \
     winmain.cpp
 
 EXTRA_DIST = \
-    $(headers) $(sources)
+    ${headers} \
+    ${sources}
 
 
 iwyu:

diff --git a/sample/json2timetable/Makefile.am b/sample/json2timetable/Makefile.am
@@ -8,11 +8,18 @@ SUBDIRS = \
     ${SOURCE_SUBDIRS} \
     data
 
+data_files = \
+    README.md
+
 EXTRA_DIST = \
-    README.md \
+    ${data_files} \
     json2timetable.vcxproj \
     json2timetable.vcxproj.filters
 
+json2timetable_datadir = ${pkgdatadir}/json2timetable
+
+json2timetable_data_DATA = ${data_files}
+
 
 iwyu: ${SOURCE_SUBDIRS}
 

diff --git a/sample/json2timetable/data/Makefile.am b/sample/json2timetable/data/Makefile.am
@@ -5,8 +5,8 @@ data_files = \
     hohi_down.json \
     hohi_up.json
 
-EXTRA_DIST = $(data_files)
+EXTRA_DIST = ${data_files}
 
-json2timetable_datadir = $(pkgdatadir)/json2timetable
+json2timetable_datadir = ${pkgdatadir}/json2timetable
 
-json2timetable_data_DATA = $(data_files)
+json2timetable_data_DATA = ${data_files}
diff --git a/sample/make_dict/Makefile.am b/sample/make_dict/Makefile.am
@@ -4,11 +4,18 @@
 SUBDIRS = \
     src
 
+data_files = \
+    README.md
+
 EXTRA_DIST = \
-    README.md \
+    ${data_files} \
     make_dict.vcxproj \
     make_dict.vcxproj.filters
 
+make_dict_datadir = ${pkgdatadir}/make_dict
+
+make_dict_data_DATA = ${data_files}
+
 
 iwyu: ${SUBDIRS}
 

diff --git a/sample/search_dict/Makefile.am b/sample/search_dict/Makefile.am
@@ -4,11 +4,18 @@
 SUBDIRS = \
     src
 
+data_files = \
+    README.md
+
 EXTRA_DIST = \
-    README.md \
+    ${data_files} \
     search_dict.vcxproj \
     search_dict.vcxproj.filters
 
+search_dict_datadir = ${pkgdatadir}/search_dict
+
+search_dict_data_DATA = ${data_files}
+
 
 iwyu: ${SUBDIRS}
 

diff --git a/sample/search_dict_c/Makefile.am b/sample/search_dict_c/Makefile.am
@@ -4,11 +4,18 @@
 SUBDIRS = \
     src
 
+data_files = \
+    README.md
+
 EXTRA_DIST = \
-    README.md \
+    ${data_files} \
     search_dict_c.vcxproj \
     search_dict_c.vcxproj.filters
 
+search_dict_c_datadir = ${pkgdatadir}/search_dict_c
+
+search_dict_c_data_DATA = ${data_files}
+
 
 iwyu: ${SUBDIRS}
 

diff --git a/sample/transfer_trains/Makefile.am b/sample/transfer_trains/Makefile.am
@@ -8,11 +8,18 @@ SUBDIRS = \
     ${SOURCE_SUBDIRS} \
     data
 
+data_files = \
+    README.md
+
 EXTRA_DIST = \
-    README.md \
+    ${data_files} \
     transfer_trains.vcxproj \
     transfer_trains.vcxproj.filters
 
+transfer_trains_datadir = ${pkgdatadir}/transfer_trains
+
+transfer_trains_data_DATA = ${data_files}
+
 
 iwyu: ${SOURCE_SUBDIRS}
 

diff --git a/sample/transfer_trains/data/Makefile.am b/sample/transfer_trains/data/Makefile.am
@@ -5,8 +5,8 @@ data_files = \
     kagoshima_down.txt \
     kotoku_up.txt
 
-EXTRA_DIST = $(data_files)
+EXTRA_DIST = ${data_files}
 
-transfer_trains_datadir = $(pkgdatadir)/transfer_trains
+transfer_trains_datadir = ${pkgdatadir}/transfer_trains
 
-transfer_trains_data_DATA = $(data_files)
+transfer_trains_data_DATA = ${data_files}