[Libburn] Installation directory

[Joe Neeman]

Andreas Schik wrote:

> Hi there,
> I am encountering problems with the installation directory for the 
> header files libburn.h and libisofs.h. They get installed to 
> ${PREFIX}/include/libburn/0 which results in compile errors as they 
> are not found. The problem hereby are not my sources as I can adjust 
> them, but the mentioned headers themselves. For example, libisofs.h 
> does the following:
>
> #include "libburn/libburn.h"
>
> This fails with the headers in this location. Moving them up one level 
> helps.
> Any reason why they are copied there?


I think the reason is to emphasise the fact that the API will probably 
change between major versions. I guess the way to fix this would be to 
change libisofs.h to have #include <libburn.h> and rely on pkg-config to 
do the rest. Patch attached.

Joe
-------------- next part --------------
Index: libisofs/Makefile.am
===================================================================
RCS file: /cvs/burn/burn/libisofs/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- libisofs/Makefile.am	15 Aug 2005 13:06:34 -0000	1.2
+++ libisofs/Makefile.am	2 Sep 2005 21:57:49 -0000
@@ -27,7 +27,7 @@
 test_SOURCES = test.c
 test_LDADD = $(libisofs_la_OBJECTS)
 
-INCLUDES = -I..
+INCLUDES = -I../libburn
 
 ## ========================================================================= ##
 indent_files = $(libisofs_la_SOURCES) 
Index: libisofs/ecma119.c
===================================================================
RCS file: /cvs/burn/burn/libisofs/ecma119.c,v
retrieving revision 1.2
diff -u -r1.2 ecma119.c
--- libisofs/ecma119.c	15 Aug 2005 13:06:34 -0000	1.2
+++ libisofs/ecma119.c	2 Sep 2005 21:57:52 -0000
@@ -7,7 +7,6 @@
 #include "struct.h"
 #include "rockridge.h"
 #include "libisofs.h"
-#include "libburn/libburn.h"
 #include <stdlib.h>
 #include <stdint.h>
 #include <sys/types.h>
Index: libisofs/libisofs.h
===================================================================
RCS file: /cvs/burn/burn/libisofs/libisofs.h,v
retrieving revision 1.17
diff -u -r1.17 libisofs.h
--- libisofs/libisofs.h	18 Jul 2005 22:44:12 -0000	1.17
+++ libisofs/libisofs.h	2 Sep 2005 21:57:53 -0000
@@ -12,7 +12,7 @@
 #ifndef __LIBISOFS
 #define __LIBISOFS
 
-#include "libburn/libburn.h"
+#include <libburn.h>
 
 /**
  * Data volume.
Index: libisofs/test.c
===================================================================
RCS file: /cvs/burn/burn/libisofs/test.c,v
retrieving revision 1.2
diff -u -r1.2 test.c
--- libisofs/test.c	15 Aug 2005 13:06:34 -0000	1.2
+++ libisofs/test.c	2 Sep 2005 21:57:53 -0000
@@ -3,8 +3,8 @@
 
 #define _GNU_SOURCE
 
-#include "libisofs/libisofs.h"
-#include "libburn/libburn.h"
+#include <libisofs.h>
+#include <libburn.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>