Skip to content

Commit c8c9621

Browse files
committed
Back to symlink for the cowsay.1 man page, and do that in-repo in make man, too
The `.so` macro page produced by asciidoctor doesn't work right on some systems, including macOS and FreeBSD, and some Linuxes. See discussion starting at: #26 (comment)
1 parent 419af3f commit c8c9621

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Cowsay Changelog
1212
- Fix installation location ("prefix") detection for cases like user-defined symlinks, and align repo layout with installation prefix dir layout ([#49](https://github.com/cowsay-org/cowsay/issues/49), [#55](https://github.com/cowsay-org/cowsay/issues/55))
1313
- Remove broken .pm cows ([#54](https://github.com/cowsay-org/cowsay/issues/54))
1414
- Support for the .pm cowfile format never got implemented. This keeps non-working cows from appearing in the `cowsay -l` list and the like.
15+
- Expand `cowsay --help` screen, and the man page a bit
1516

1617
### Internal changes
1718

Makefile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,16 @@ clean:
6262
# install time to avoid introducing a dependency on Asciidoctor for users.
6363

6464
.PHONY: man
65-
man: man/man1/cowsay.1 man/man1/cowthink.1
65+
man: man/man1/cowsay.1.adoc man/man1/cowsay.1
6666

67-
man/cowsay.1: man/man1/cowsay.1.adoc
68-
$(ASCIIDOCTOR) -b manpage man/man1/cowsay.1.adoc
69-
70-
man/cowthink.1: man/man1/cowsay.1.adoc
67+
# asciidoctor generates both cowsay.1 and cowthink.1, but the cowthink.1 uses an '.so'
68+
# include macro that doesn't work on some systems, but symlinks do.
69+
# cowthink.1 is generated as a side effect of cowsay.1, but I'm not sure how
70+
# to declare that without a redundant target definition.
71+
man/man1/cowsay.1: man/man1/cowsay.1.adoc
7172
$(ASCIIDOCTOR) -b manpage man/man1/cowsay.1.adoc
73+
rm -f man/man1/cowthink.1
74+
$(LN_S) cowsay.1 man/man1/cowthink.1
7275

7376
.PHONY: install
7477
install:
@@ -78,7 +81,7 @@ install:
7881
$(LN_S) cowsay $(DESTDIR)$(bindir)/cowthink
7982
$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
8083
$(INSTALL_DATA) man/man1/cowsay.1 $(DESTDIR)$(mandir)/man1/cowsay.1
81-
$(INSTALL_DATA) man/man1/cowthink.1 $(DESTDIR)$(mandir)/man1/cowthink.1
84+
$(LN_S) cowsay.1 $(DESTDIR)$(mandir)/man1/cowthink.1
8285
$(INSTALL_DIR) $(DESTDIR)$(cowsdir)
8386
$(INSTALL_DATA) $(COW_FILES) $(DESTDIR)$(cowsdir)
8487
$(INSTALL_DIR) $(DESTDIR)$(sitecowsdir)

man/man1/cowthink.1

Lines changed: 0 additions & 1 deletion
This file was deleted.

man/man1/cowthink.1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cowsay.1

0 commit comments

Comments
 (0)