SHA256
1
0
forked from pool/ndpi
ndpi/ndpi-fix-build.patch
Lars Vogdt 0ebcffe2ed Accepting request 660744 from home:mnhauke:security
- Update to version 2.6
  See /usr/share/doc/packages/libndpi2/CHANGELOG.md for the full
  changelog

OBS-URL: https://build.opensuse.org/request/show/660744
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/ndpi?expand=0&rev=2
2018-12-28 14:25:06 +00:00

41 lines
1.3 KiB
Diff

diff --git a/Makefile.am b/Makefile.am
index 37f0849..4090817 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src/lib example tests
-pkgconfigdir = $(prefix)/libdata/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libndpi.pc
EXTRA_DIST = autogen.sh
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 0ffeb9d..2c0296a 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -10,8 +10,8 @@
#
# Installation directories
#
-prefix = /usr/local
-libdir = ${prefix}/lib
+prefix = /usr
+libdir = ${prefix}/lib64
includedir = ${prefix}/include/ndpi
CC = @CC@
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g
@@ -60,8 +60,8 @@ distclean: clean
install: $(NDPI_LIBS)
mkdir -p $(DESTDIR)$(libdir)
- cp $(NDPI_LIBS) $(DESTDIR)$(libdir)/
- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE)
- ln -Ffs $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED) $(DESTDIR)$(libdir)/$(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
+ ln -sf $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE)
+ ln -sf $(NDPI_LIB_SHARED) $(NDPI_LIB_SHARED_BASE).$(NDPI_VERSION_MAJOR)
+ cp -v libndpi.so* $(DESTDIR)$(libdir)/
mkdir -p $(DESTDIR)$(includedir)
cp ../include/*.h $(DESTDIR)$(includedir)