- up to 0.103.1

[packages/clamav.git] / clamav-headers.patch

diff -urNp -x '*.orig' clamav-0.103.0.org/Makefile.am clamav-0.103.0/Makefile.am
--- clamav-0.103.0.org/Makefile.am	2020-09-13 02:27:09.000000000 +0200
+++ clamav-0.103.0/Makefile.am	2021-04-06 16:40:36.893437739 +0200
@@ -46,7 +46,7 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libclamav.pc
 
-nodist_include_HEADERS = clamav-types.h clamav-version.h
+pkginclude_HEADERS = clamav-types.h clamav-version.h
 
 # don't complain that configuration files and databases are not removed, this is intended
 distuninstallcheck_listfiles = find . -type f ! -name clamd.conf ! -name freshclam.conf ! -name daily.cvd ! -name main.cvd -print
diff -urNp -x '*.orig' clamav-0.103.0.org/clamav-config.in clamav-0.103.0/clamav-config.in
--- clamav-0.103.0.org/clamav-config.in	2020-09-13 02:27:09.000000000 +0200
+++ clamav-0.103.0/clamav-config.in	2021-04-06 16:40:36.893437739 +0200
@@ -3,7 +3,7 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-includedir=@includedir@
+includedir=@includedir@/clamav
 libdir=@libdir@
 
 usage()
@@ -55,7 +55,7 @@ while test $# -gt 0; do
 	;;
 
     --cflags)
-       	echo -I@includedir@ @CFLAGS@
+       	echo -I${includedir} @CFLAGS@
        	;;
 
     --libs)
diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav/Makefile.am clamav-0.103.0/libclamav/Makefile.am
--- clamav-0.103.0.org/libclamav/Makefile.am	2021-04-06 16:40:36.403412280 +0200
+++ clamav-0.103.0/libclamav/Makefile.am	2021-04-06 16:40:36.893437739 +0200
@@ -251,7 +251,7 @@ if VERSIONSCRIPT
 libclamav_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
 endif
 
-include_HEADERS = clamav.h
+pkginclude_HEADERS = clamav.h
 
 libclamav_la_SOURCES = \
 	matcher-ac.c \
diff -urNp -x '*.orig' clamav-0.103.0.org/libclamav.pc.in clamav-0.103.0/libclamav.pc.in
--- clamav-0.103.0.org/libclamav.pc.in	2020-09-13 02:27:09.000000000 +0200
+++ clamav-0.103.0/libclamav.pc.in	2021-04-06 16:40:36.893437739 +0200
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@
+includedir=@includedir@/clamav
 
 Name: libclamav
 Description: A GPL virus scanner
diff -urNp -x '*.orig' clamav-0.103.0.org/libfreshclam/Makefile.am clamav-0.103.0/libfreshclam/Makefile.am
--- clamav-0.103.0.org/libfreshclam/Makefile.am	2020-09-13 02:27:10.000000000 +0200
+++ clamav-0.103.0/libfreshclam/Makefile.am	2021-04-06 16:40:36.893437739 +0200
@@ -32,7 +32,7 @@ AM_LIBTOOLFLAGS = --tag CXX
 
 EXTRA_DIST = libfreshclam.map libfreshclam_main.c
 
-include_HEADERS = libfreshclam.h
+pkginclude_HEADERS = libfreshclam.h
 
 libfreshclam_la_SOURCES = \
     libfreshclam.c \