From 9f7c0362e26f62dc81769ab55a89e32c3c9a268d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 6 Aug 2023 01:07:46 +0200
Subject: Fix incorrect use of dvdread includes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems that the library has been designed for use includes in the form
"#include <dvdread/...>" while we used includes without the "dvdread/" prefix.
This caused that instead of using the standard path detected from pkg-config,
the expected path had to be added to to -I flag.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 libk9copy/Makefile.am |  2 +-
 libk9copy/k9common.h  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libk9copy')

diff --git a/libk9copy/Makefile.am b/libk9copy/Makefile.am
index 60b0855..9a2bcd4 100644
--- a/libk9copy/Makefile.am
+++ b/libk9copy/Makefile.am
@@ -24,6 +24,6 @@ noinst_HEADERS = bswap.h k9audiocodecs.h k9backupdlg.h k9burndvd.h k9cell.h \
 	k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
 
 
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
+INCLUDES = -I$(top_srcdir)/k9decmpeg \
 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
 libk9copy_la_LDFLAGS = $(all_libraries)
diff --git a/libk9copy/k9common.h b/libk9copy/k9common.h
index 249cf8d..c7e396a 100644
--- a/libk9copy/k9common.h
+++ b/libk9copy/k9common.h
@@ -28,11 +28,11 @@
 #ifdef __FreeBSD__
     #include <osreldate.h>
 #endif
-#include "ifo_types.h"
-#include "dvd_reader.h"
-#include "ifo_read.h"
-#include "nav_read.h"
-#include "nav_types.h"
+#include <dvdread/ifo_types.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_types.h>
 
 #include <tqobject.h>
 #include <tqobjectlist.h>
-- 
cgit v1.2.1