From 62081a021f7cf5c7e4e8c0fa8170731ba522d0c2 Mon Sep 17 00:00:00 2001
From: Erica Ehrhardt <955421+SteelPangolin@users.noreply.github.com>
Date: Thu, 14 Jan 2021 17:02:53 -0800
Subject: [PATCH] Meson: install libpsl man page, DAFSA builder

Partially addresses issue #136,
at least when building from a distribution tarball.
---
 docs/libpsl/Makefile.am | 2 +-
 docs/libpsl/meson.build | 1 +
 meson.build             | 1 +
 meson.build.in          | 1 +
 src/meson.build         | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 docs/libpsl/meson.build

diff --git a/docs/libpsl/Makefile.am b/docs/libpsl/Makefile.am
index 369e757..cb641fa 100644
--- a/docs/libpsl/Makefile.am
+++ b/docs/libpsl/Makefile.am
@@ -86,7 +86,7 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
+EXTRA_DIST += meson.build
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/docs/libpsl/meson.build b/docs/libpsl/meson.build
new file mode 100644
index 0000000..ee17494
--- /dev/null
+++ b/docs/libpsl/meson.build
@@ -0,0 +1 @@
+install_man('libpsl.3')
diff --git a/meson.build b/meson.build
index f248171..7cc2bb5 100644
--- a/meson.build
+++ b/meson.build
@@ -150,3 +150,4 @@ subdir('src')
 subdir('tools')
 subdir('tests')
 subdir('fuzz')
+subdir(join_paths('docs', 'libpsl'))
diff --git a/meson.build.in b/meson.build.in
index f6889ef..41166a4 100644
--- a/meson.build.in
+++ b/meson.build.in
@@ -150,3 +150,4 @@ subdir('src')
 subdir('tools')
 subdir('tests')
 subdir('fuzz')
+subdir(join_paths('docs', 'libpsl'))
diff --git a/src/meson.build b/src/meson.build
index 0d1dcdf..5f4208e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,4 +31,5 @@ pkgconfig.generate(libpsl,
 libpsl_dep = declare_dependency(link_with : libpsl,
   include_directories : includedir)
 
+install_data('psl-make-dafsa', install_dir : get_option('bindir'))
 install_man('psl-make-dafsa.1')