remove the need for lib/sfio to be in the include path

diff --git a/lib/ast/ast.h b/lib/ast/ast.h
index 2d19838d7d93d3dc3f902311e51abb9fb6c2c029..dc5eeda4df49264ac4e7aa58873ea1f8428c5200 100644 (file)
--- a/lib/ast/ast.h
+++ b/lib/ast/ast.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef AST_H
 #define AST_H
 
-#include <sfio.h>
+#include <sfio/sfio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #ifdef sun

diff --git a/lib/ast/sfstr.h b/lib/ast/sfstr.h
index 33b37bf4e00dfc6bba2eee4308e61c54c23cc78a..daa893a061fcae6e3b65543004cbc77af54e9c25 100644 (file)
--- a/lib/ast/sfstr.h
+++ b/lib/ast/sfstr.h
@@ -22,7 +22,7 @@ extern "C" {
 #ifndef _SFSTR_H
 #define _SFSTR_H
 
-#include <sfio.h>
+#include <sfio/sfio.h>
 
 #define sfstropen()    sfnew((Sfio_t*)0,(char*)0,-1,-1,SF_WRITE|SF_STRING)
 #define sfstrclose(f)  sfclose(f)

diff --git a/lib/gvpr/compile.h b/lib/gvpr/compile.h
index bae862abebbc4d60dcce8ed68ced409e8736e720..8107cf4774af9db96bd9aaa43eea25790e661b58 100644 (file)
--- a/lib/gvpr/compile.h
+++ b/lib/gvpr/compile.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef COMPILE_H
 #define COMPILE_H
 
-#include <sfio.h>
+#include <sfio/sfio.h>
 #include <parse.h>
 #include <gprstate.h>
 #include <expr/expr.h>

diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h
index b7c20ec4157c2c123a4f0a23c74b17c931fb2fbb..3790950a258d091c37836965dd3f36b8b159a62d 100644 (file)
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef GPRSTATE_H
 #define GPRSTATE_H
 
-#include "sfio.h"
+#include <sfio/sfio.h>
 #include "cgraph.h"
 #include <ast/ast.h>
 #include "vmalloc.h"

diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h
index 853c80e8957c3e4c969f4e7e178c60ba6545a910..cf2169e9a3e4b6779df59618d1652c0b657ec9fb 100644 (file)
--- a/lib/sfio/sfhdr.h
+++ b/lib/sfio/sfhdr.h
@@ -27,10 +27,10 @@ extern "C" {
 **     Written by Kiem-Phong Vo
 */
 
-#include       "sfio_t.h"
+#include       <sfio/sfio_t.h>
 #include       "config.h"
 
-#include       "vthread.h"
+#include       <sfio/vthread.h>
 
 #if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE)
 #define _NO_LARGEFILE64_SOURCE  1

diff --git a/lib/sfio/sfio_t.h b/lib/sfio/sfio_t.h
index 8643d40722ce8e5396304e4783f53b49161d0bdf..dd9f630fb7705a5b04f1c506e410ef5e414162b6 100644 (file)
--- a/lib/sfio/sfio_t.h
+++ b/lib/sfio/sfio_t.h
@@ -43,7 +43,7 @@ extern "C" {
        Sfoff_t                 lpos;   /* last seek position           */ \
        size_t                  iosz;   /* prefer size for I/O          */
 
-#include       "sfio.h"
+#include       <sfio/sfio.h>
 
 /* mode bit to indicate that the structure hasn't been initialized */
 #define SF_INIT                0000004u