bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix distcheck invocation in doc/ directory

Browse source 
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>
This commit is contained in:
Dan McGee 2010-06-16 21:01:09 -05:00
parent 2ee186506c
commit 892266277e
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
doc/Makefile.am
View file

@ -66,12 +66,6 @@ else
REAL_PACKAGE_VERSION = $(PACKAGE_VERSION) REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
endif 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 = man_MANS =
dist_man_MANS = $(ASCIIDOC_MANS) repo-remove.8 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' --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 # These rules are due to the includes and files of the asciidoc text
$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile $(ASCIIDOC_MANS): asciidoc.conf footer.txt
@echo GEN $@; a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.txt
@test -f $(srcdir)/$@.txt && $(edit) $(srcdir)/$@.txt >$@.tmp || true
a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS)" $@.tmp
@rm -f $@.tmp
%.html: %.txt %.html: %.txt
asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt asciidoc $(ASCIIDOC_OPTS) -a linkcss $*.txt

16
doc/makepkg.conf.5.txt
View file

@ -135,17 +135,17 @@ Options
affects both generation and checking. The current valid options are: affects both generation and checking. The current valid options are:
`md5`, `sha1`, `sha256`, `sha384`, and `sha512`. `md5`, `sha1`, `sha256`, `sha384`, and `sha512`.
**STRIP_BINARIES=**"@STRIP_BINARIES@":: **STRIP_BINARIES=**"--strip-all"::
Options to be used when stripping binaries. See `strip''s man page Options to be used when stripping binaries. See linkman:strip[1]
for details. for details.
**STRIP_SHARED=**"@STRIP_SHARED@":: **STRIP_SHARED=**"--strip-unneeded"::
Options to be used when stripping shared libraries. See `strip''s Options to be used when stripping shared libraries. See linkman:strip[1]
man page for details. for details.
**STRIP_STATIC=**"@STRIP_STATIC@":: **STRIP_STATIC=**"--strip-debug"::
Options to be used when stripping static libraries. See `strip''s Options to be used when stripping static libraries. See linkman:strip[1]
man page for details. for details.
**MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**::
If `zipman` is specified in the OPTIONS array, this variable will If `zipman` is specified in the OPTIONS array, this variable will