[PATCH] 0001-Bunch-of-build-system-fixes.patch

[Joerg Mayer <jmayer () loplof de>]

> From aee291b3e5f66c5ca780d89535fa16909a3937ae Mon Sep 17 00:00:00 2001
From: Joerg Mayer <jmayer () loplof de>
Date: Sat, 11 Mar 2017 12:11:53 +0100
Subject: [PATCH] Bunch of build system fixes

Add install target for rpcapd (todo: write manpage)
Fix out of tree builds for rpcapd (wouldn't find includes in ..)
File file permissions of rpcapd source
Fix compiles when HAVE_REMOTE is set (this is a hack: the include file
  should be moved into the pcap/ directory.

Signed-off-by: Joerg Mayer <jmayer () loplof de>
---
 Makefile.in       |  4 ++++
 rpcap/Makefile.in | 11 +++++++++--
 rpcap/daemon.c    |  0
 rpcap/daemon.h    |  0
 rpcap/fileconf.c  |  0
 rpcap/fileconf.h  |  0
 rpcap/rpcapd.c    |  0
 rpcap/rpcapd.h    |  0
 rpcap/utils.c     |  0
 rpcap/utils.h     |  0
 rpcap/win32-svc.c |  0
 11 files changed, 13 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 rpcap/daemon.c
 mode change 100755 => 100644 rpcap/daemon.h
 mode change 100755 => 100644 rpcap/fileconf.c
 mode change 100755 => 100644 rpcap/fileconf.h
 mode change 100755 => 100644 rpcap/rpcapd.c
 mode change 100755 => 100644 rpcap/rpcapd.h
 mode change 100755 => 100644 rpcap/utils.c
 mode change 100755 => 100644 rpcap/utils.h
 mode change 100755 => 100644 rpcap/win32-svc.c

diff --git a/Makefile.in b/Makefile.in
index 8f2a12c..0bc7dcd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,6 +27,8 @@ exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 # Pathname of directory to install the configure program
 bindir = @bindir@
+# Pathname of directory to install the rpcapd daemon
+sbindir = @sbindir@
 # Pathname of directory to install the include files
 includedir = @includedir@
 # Pathname of directory to install the library
@@ -98,6 +100,7 @@ PUBHDR = \
        pcap.h \
        pcap-bpf.h \
        pcap-namedb.h \
+       remote-ext.h \
        pcap/bpf.h \
        pcap/bluetooth.h \
        pcap/can_socketcan.h \
@@ -633,6 +636,7 @@ install: install-shared install-archive pcap-config
        for i in $(MANMISC); do \
                $(INSTALL_DATA) `echo $$i | sed 's/.manmisc.in/.manmisc/'` \
                    $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
+       cd rpcap; $(MAKE) DESTDIR=$(DESTDIR) install
 
 install-shared: install-shared-$(DYEXT)
 install-shared-so: libpcap.so
diff --git a/rpcap/Makefile.in b/rpcap/Makefile.in
index 800cbb8..e1bf550 100644
--- a/rpcap/Makefile.in
+++ b/rpcap/Makefile.in
@@ -27,6 +27,8 @@ exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 # Pathname of directory to install the configure program
 bindir = @bindir@
+# Pathname of directory to install the rpcapd daemon
+sbindir = @sbindir@
 # Pathname of directory to install the include files
 includedir = @includedir@
 # Pathname of directory to install the library
@@ -48,7 +50,7 @@ AR = @AR@
 LN_S = @LN_S@
 MKDEP = @MKDEP@
 CCOPT = @V_CCOPT@
-INCLS = -I. -I.. @V_INCLS@
+INCLS = -I. -I.. -I@srcdir@ -I@srcdir@/.. @V_INCLS@
 DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@
 ADDLOBJS = @ADDLOBJS@
 ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
@@ -99,7 +101,7 @@ EXTRA_DIST = \
        Makefile-devel-adds
 
 rpcapd: $(OBJ) ../libpcap.a
-       $(CC) -o $@ $(OBJ) ../libpcap.a
+       $(CC) $(LDFLAGS) -o $@ $(OBJ) ../libpcap.a
 clean:
        rm -f $(CLEANFILES)
 
@@ -109,6 +111,11 @@ distclean: clean
            stamp-h stamp-h.in
        rm -rf autom4te.cache
 
+install: rpcapd
+       [ -d $(DESTDIR)$(sbindir) ] || \
+           (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir))
+       $(INSTALL_PROGRAM) rpcapd $(DESTDIR)$(sbindir)/rpcapd
+
 tags: $(TAGFILES)
        ctags -wtd $(TAGFILES)
 
diff --git a/rpcap/daemon.c b/rpcap/daemon.c
old mode 100755
new mode 100644
diff --git a/rpcap/daemon.h b/rpcap/daemon.h
old mode 100755
new mode 100644
diff --git a/rpcap/fileconf.c b/rpcap/fileconf.c
old mode 100755
new mode 100644
diff --git a/rpcap/fileconf.h b/rpcap/fileconf.h
old mode 100755
new mode 100644
diff --git a/rpcap/rpcapd.c b/rpcap/rpcapd.c
old mode 100755
new mode 100644
diff --git a/rpcap/rpcapd.h b/rpcap/rpcapd.h
old mode 100755
new mode 100644
diff --git a/rpcap/utils.c b/rpcap/utils.c
old mode 100755
new mode 100644
diff --git a/rpcap/utils.h b/rpcap/utils.h
old mode 100755
new mode 100644
diff --git a/rpcap/win32-svc.c b/rpcap/win32-svc.c
old mode 100755
new mode 100644
-- 
2.10.1 (Apple Git-78)

-- 
Joerg Mayer                                           <jmayer () loplof de>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.
_______________________________________________
tcpdump-workers mailing list
tcpdump-workers () lists tcpdump org
https://lists.sandelman.ca/mailman/listinfo/tcpdump-workers