From: Duncan Roe <duncan_roe@optusnet.com.au>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH libnetfilter_queue 1/2] build: dist: Add fixmanpages.sh to distribution tree
Date: Mon, 8 Jun 2020 17:15:00 +1000 [thread overview]
Message-ID: <20200608071501.14448-2-duncan_roe@optusnet.com.au> (raw)
In-Reply-To: <20200608071501.14448-1-duncan_roe@optusnet.com.au>
In-Reply-To: <20200607184716.GA20705@salvia>
Also move fixmanpages.sh into the doxygen directory
Tested by running Slackware package builder on libnetfilter_queue-1.0.4.tar.bz2
created by 'make dist' after applying the patch. Works now, failed before.
Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
Makefile.am | 1 +
doxygen/Makefile.am | 4 ++--
fixmanpages.sh => doxygen/fixmanpages.sh | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
rename fixmanpages.sh => doxygen/fixmanpages.sh (99%)
diff --git a/Makefile.am b/Makefile.am
index a5b347b..7d3bf23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,4 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnetfilter_queue.pc
EXTRA_DIST += Make_global.am
+EXTRA_DIST += doxygen/fixmanpages.sh
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index ef468e0..a4db804 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -8,8 +8,8 @@ doc_srcs = $(top_srcdir)/src/libnetfilter_queue.c \
$(top_srcdir)/src/extra/udp.c \
$(top_srcdir)/src/extra/pktbuff.c
-doxyfile.stamp: $(doc_srcs) $(top_srcdir)/fixmanpages.sh
- rm -rf html man && cd .. && doxygen doxygen.cfg && ./fixmanpages.sh
+doxyfile.stamp: $(doc_srcs) fixmanpages.sh
+ rm -rf html man && (cd .. && doxygen doxygen.cfg) && ./fixmanpages.sh
touch doxyfile.stamp
CLEANFILES = doxyfile.stamp
diff --git a/fixmanpages.sh b/doxygen/fixmanpages.sh
similarity index 99%
rename from fixmanpages.sh
rename to doxygen/fixmanpages.sh
index dd8b3a4..38e97ba 100755
--- a/fixmanpages.sh
+++ b/doxygen/fixmanpages.sh
@@ -3,7 +3,7 @@
function main
{
set -e
- cd doxygen/man/man3
+ cd man/man3
rm -f _*
setgroup LibrarySetup nfq_open
add2group nfq_close nfq_bind_pf nfq_unbind_pf
--
2.14.5
next prev parent reply other threads:[~2020-06-08 7:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-06 14:25 [PATCH libnetfilter_queue 0/1] URGENT: libnetfilter_queue-1.0.4 fails to build Duncan Roe
2020-06-06 14:25 ` [PATCH libnetfilter_queue v2 1/1] build: dist: Add fixmanpages.sh to distribution tree Duncan Roe
2020-06-07 18:29 ` Pablo Neira Ayuso
2020-06-07 18:39 ` Pablo Neira Ayuso
2020-06-07 18:47 ` Pablo Neira Ayuso
2020-06-08 7:14 ` [PATCH libnetfilter_queue 0/2] Force 'make distcheck' to pass Duncan Roe
2020-06-08 21:37 ` Pablo Neira Ayuso
2020-06-08 7:15 ` Duncan Roe [this message]
2020-06-08 7:15 ` [PATCH libnetfilter_queue 2/2] build: dist: " Duncan Roe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200608071501.14448-2-duncan_roe@optusnet.com.au \
--to=duncan_roe@optusnet.com.au \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).