manpages: patch in the correct installed location of the config file.

This resolves http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54717
This commit is contained in:
ng0 2019-11-28 10:17:11 +00:00
parent ebd62ce4ae
commit dad0c10232
4 changed files with 18 additions and 5 deletions

4
.gitignore vendored Normal file
View file

@ -0,0 +1,4 @@
*.o
*.final
y.tab.c
doas

View file

@ -1,3 +1,4 @@
AWK?=awk
CC?=clang
YACC?=yacc
BIN=doas
@ -39,7 +40,7 @@ ifeq ($(UNAME_S),Darwin)
MANDIR=$(DESTDIR)$(PREFIX)/share/man
endif
all: $(OBJECTS)
all: $(OBJECTS) doas.1.final doas.conf.5.final
$(CC) -o $(BIN) $(OBJECTS) $(LDFLAGS)
env.o: doas.h env.c
@ -59,10 +60,18 @@ install: $(BIN)
cp $(BIN) $(DESTDIR)$(PREFIX)/bin/
chmod 4755 $(DESTDIR)$(PREFIX)/bin/$(BIN)
mkdir -p $(MANDIR)/man1
cp doas.1 $(MANDIR)/man1/
cp doas.1.final $(MANDIR)/man1/doas.1
mkdir -p $(MANDIR)/man5
cp doas.conf.5 $(MANDIR)/man5/
cp doas.conf.5.final $(MANDIR)/man5/doas.conf.5
clean:
rm -f $(BIN) $(OBJECTS) y.tab.c
rm -f *.final
# Doing it this way allows to change the original files
# only partially instead of renaming them.
doas.1.final:
$(AWK) -v pfx="$(SYSCONFDIR)" '{gsub("@SUBSTSYSCONFDIR@",pfx); print $$0}' < doas.1 > doas.1.final
doas.conf.5.final:
$(AWK) -v pfx="$(SYSCONFDIR)" '{gsub("@SUBSTSYSCONFDIR@",pfx); print $$0}' < doas.conf.5 > doas.conf.5.final

2
doas.1
View file

@ -91,7 +91,7 @@ It may fail for one of the following reasons:
.Bl -bullet -compact
.It
The config file
.Pa /usr/local/etc/doas.conf
.Pa @SUBSTSYSCONFDIR@/doas.conf
could not be parsed.
.It
The user attempted to run a command which is not permitted.

View file

@ -20,7 +20,7 @@
.Nm doas.conf
.Nd doas configuration file
.Sh SYNOPSIS
.Nm /usr/local/etc/doas.conf
.Nm @SUBSTSYSCONFDIR@/doas.conf
.Sh DESCRIPTION
The
.Xr doas 1