Fix distcheck invocation in doc/ directoryv3.4.0

Commit 5fe41df8 broke `make distcheck` pretty badly for the doc directory.
Looking at what this commit was trying to accomplish, it make sense to
revert a lot of the build system changes and just simplify what we are
showing in the man page anyway- an example, not exactly how it is configured
on your system.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 10 insertions, 19 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d5b7aada..ad677391 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -66,12 +66,6 @@ else
 REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
 endif
 
-#### Taken from the autoconf scripts Makefile.am ####
-edit = sed \
-	-e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \
-	-e 's|@STRIP_SHARED[@]|$(STRIP_SHARED)|g' \
-	-e 's|@STRIP_STATIC[@]|$(STRIP_STATIC)|g'
-
 man_MANS =
 dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8
 
@@ -102,11 +96,8 @@ A2X_OPTS = \
 	--xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
 
 # These rules are due to the includes and files of the asciidoc text
-$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile
-	@echo GEN $@;
-	@test -f $(srcdir)/$@.txt && $(edit) $(srcdir)/$@.txt >$@.tmp || true
-	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.tmp
-	@rm -f $@.tmp
+$(ASCIIDOC_MANS): asciidoc.conf footer.txt
+	a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
 
 %.html: %.txt
 	asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 55e71cc7..753b1792 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -135,17 +135,17 @@ Options
 	affects both generation and checking. The current valid options are:
 	`md5`, `sha1`, `sha256`, `sha384`, and `sha512`.
 
-**STRIP_BINARIES=**"@STRIP_BINARIES@"::
-	Options to be used when stripping binaries. See `strip''s man page
+**STRIP_BINARIES=**"--strip-all"::
+	Options to be used when stripping binaries. See linkman:strip[1]
 	for details.
 
-**STRIP_SHARED=**"@STRIP_SHARED@"::
-	Options to be used when stripping shared libraries. See `strip''s
-	man page for details.
+**STRIP_SHARED=**"--strip-unneeded"::
+	Options to be used when stripping shared libraries. See linkman:strip[1]
+	for details.
 
-**STRIP_STATIC=**"@STRIP_STATIC@"::
-	Options to be used when stripping static libraries. See `strip''s
-	man page for details.
+**STRIP_STATIC=**"--strip-debug"::
+	Options to be used when stripping static libraries. See  linkman:strip[1]
+	for details.
 
 **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**::
 	If `zipman` is specified in the OPTIONS array, this variable will