From de4e8bdee098f0c7206e088c0ef46140c5cb5567 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jan 2020 16:02:23 +0000 Subject: [PATCH] install: Fix install path for stdlib, and install man pages. --- Goalfile.in | 8 ++++++-- goals.spec.in | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Goalfile.in b/Goalfile.in index ca38d24..722fd2b 100644 --- a/Goalfile.in +++ b/Goalfile.in @@ -179,10 +179,14 @@ goal install = { # exec_prefix die die die bindir="@prefix@/bin" datadir="@prefix@/share" + mandir="$datadir/man" mkdir -p %DESTDIR"$bindir" - mkdir -p %DESTDIR"$datadir/goals" + mkdir -p %DESTDIR"$datadir/goals/stdlib" + mkdir -p %DESTDIR"$mandir/man1" %DESTDIR"$mandir/man5" install src/goals %DESTDIR"$bindir" -m 0755 - install %stdlibfiles %DESTDIR"$datadir"/goals -m 644 + install %stdlibfiles %DESTDIR"$datadir"/goals/stdlib -m 644 + install man/*.1 %DESTDIR"$mandir"/man1/ -m 644 + install man/*.5 %DESTDIR"$mandir"/man5/ -m 644 } #---------------------------------------------------------------------- diff --git a/goals.spec.in b/goals.spec.in index d77af16..f71edfd 100644 --- a/goals.spec.in +++ b/goals.spec.in @@ -46,9 +46,12 @@ make %{?_smp_mflags} check %doc README TODO %license COPYING %{_bindir}/goals +%{_mandir}/man1/*.1* +%{_mandir}/man5/*.5* %dir %{_datadir}/goals -%{_datadir}/goals/*.gl -%{_datadir}/goals/*.sh +%dir %{_datadir}/goals/stdlib +%{_datadir}/goals/stdlib/*.gl +%{_datadir}/goals/stdlib/*.sh %changelog -- 1.8.3.1