From 630ae72b1af8764cdfe28a5345f8b30b2ff132dd Mon Sep 17 00:00:00 2001 From: Dan Church Date: Fri, 26 Aug 2022 16:54:08 -0500 Subject: [PATCH 1/2] Use autotools standard ${docdir} Specified with `--docdir=`, the `$(docdir)` variable is already available, and has the same default as what it was being set to. By specifying it here, it overrides what the `--docdir` option specifies. --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index f5c1db594a..4a3ca16ced 100644 --- a/Makefile.am +++ b/Makefile.am @@ -217,7 +217,6 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) \ # README.md is expected in Github projects, good stuff in it, so we'll # distribute it and install it with the package in the doc directory. -docdir = ${datadir}/doc/${PACKAGE} dist_doc_DATA = README.md COPYING AUTHORS README pkgconfigdir = $(libdir)/pkgconfig From 4cd72e4eba02683c05a1bc2ce488318ad252096b Mon Sep 17 00:00:00 2001 From: Dan Church Date: Fri, 26 Aug 2022 17:04:31 -0500 Subject: [PATCH 2/2] Remove redundant README The README symlink was causing the file to be installed twice in . --- Makefile.am | 2 +- README | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 README diff --git a/Makefile.am b/Makefile.am index 4a3ca16ced..319715e072 100644 --- a/Makefile.am +++ b/Makefile.am @@ -217,7 +217,7 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) \ # README.md is expected in Github projects, good stuff in it, so we'll # distribute it and install it with the package in the doc directory. -dist_doc_DATA = README.md COPYING AUTHORS README +dist_doc_DATA = README.md COPYING AUTHORS pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libjq.pc diff --git a/README b/README deleted file mode 120000 index 42061c01a1..0000000000 --- a/README +++ /dev/null @@ -1 +0,0 @@ -README.md \ No newline at end of file