[PATCH libnetfilter_queue v2 1/1] build: dist: Add fixmanpages.sh to distribution tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxxxxx>
---
 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




[Index of Archives]     [Netfitler Users]     [Berkeley Packet Filter]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux