Refer to #include files from the root of nmh's source.

One of the -I options given to the C compiler is the root of the nmh
source.  This means uip/foo.c's #include of the relative ../sbr/bar.h
can also be written more tidily as sbr/bar.h.

diff --git a/config/config.c b/config/config.c
index 39d4366..5b08db2 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -6,7 +6,7 @@
  */
 
 #include <h/mh.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include <pwd.h>
 
 #define nmhbindir(file) NMHBINDIR#file

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index f340e1e..80dabb7 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -13,7 +13,7 @@
 #include <h/netsec.h>
 
 #include <sys/socket.h>
-#include "../../sbr/base64.h"
+#include "sbr/base64.h"
 
 /*
  * This module implements an interface to SendMail very similar

diff --git a/uip/anno.c b/uip/anno.c
index d074717..521f7b9 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -43,7 +43,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define ANNO_SWITCHES \
     X("component field", 0, COMPSW) \

diff --git a/uip/annosbr.c b/uip/annosbr.c
index 7e7cefd..2071980 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 #include <utime.h>
 

diff --git a/uip/ap.c b/uip/ap.c
index d08a635..1d1ee52 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -10,7 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"
 
 #define        NADDRS  100
 

diff --git a/uip/burst.c b/uip/burst.c
index f188bf1..87538ae 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/mhparse.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 
 #define BURST_SWITCHES \

diff --git a/uip/comp.c b/uip/comp.c
index e3d8780..969b979 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include <fcntl.h>
 
 #define COMP_SWITCHES \

diff --git a/uip/dist.c b/uip/dist.c
index de0ba43..b0728bd 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include <fcntl.h>
 
 #define DIST_SWITCHES \

diff --git a/uip/distsbr.c b/uip/distsbr.c
index f29426e..bf469c3 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 
 static int  hdrfd = NOTOK;
 static int  txtfd = NOTOK;

diff --git a/uip/dp.c b/uip/dp.c
index 3575c97..dbc2670 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -9,7 +9,7 @@
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/tws.h>
-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"
 
 #define        NDATES 100
 

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 5dae787..40ec9b8 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -11,8 +11,8 @@
 #include <h/dropsbr.h>
 #include <h/mts.h>
 #include <h/tws.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 /*

diff --git a/uip/flist.c b/uip/flist.c
index cd50504..cd5682a 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -15,7 +15,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 /*
  * We allocate space to record the names of folders

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 1c4159a..627123b 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -11,8 +11,8 @@
 #include <h/utils.h>
 #include <h/scansbr.h>
 #include <h/addrsbr.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/terminal.h"
+#include "sbr/m_maildir.h"
+#include "sbr/terminal.h"
 
 #define FMTTEST_SWITCHES \
     X("form formatfile", 0, FORMSW) \

diff --git a/uip/folder.c b/uip/folder.c
index 84d0de5..625d68a 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -10,7 +10,7 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define FOLDER_SWITCHES \
     X("all", 0, ALLSW) \

diff --git a/uip/forw.c b/uip/forw.c
index 153b795..ce8a4fc 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 
 #define        IFORMAT "digest-issue-%s"

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index bce58ae..775c8ae 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -10,7 +10,7 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 
 /*
  * Take from replsbr.c - a buffer big enough to read in data header lines

diff --git a/uip/inc.c b/uip/inc.c
index ad454e1..2bd1b71 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -40,9 +40,9 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #ifndef TLS_SUPPORT
 # define TLSminc(a) (a)

diff --git a/uip/install-mh.c b/uip/install-mh.c
index ff66357..e3eab12 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -7,10 +7,10 @@
 
 #include <h/mh.h>                              /* mh internals */
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/makedir.h"
+#include "sbr/m_maildir.h"
+#include "sbr/makedir.h"
 #include <pwd.h>                               /* structure for getpwuid() results */
-#include "../sbr/read_line.h"
+#include "sbr/read_line.h"
 
 #define INSTALLMH_SWITCHES \
     X("auto", 0, AUTOSW) \

diff --git a/uip/mark.c b/uip/mark.c
index 92957cd..0b17b86 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -9,7 +9,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define MARK_SWITCHES \
     X("add", 0, ADDSW) \

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index faf9aa3..3b17f35 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -14,8 +14,8 @@
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"
 

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 9c5bd92..4af6e59 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -24,9 +24,9 @@
 #include <h/utils.h>
 #include "h/mhcachesbr.h"
 #include "mhmisc.h"
-#include "../sbr/m_mktemp.h"
-#include "../sbr/message_id.h"
-#include "../sbr/mime_type.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/message_id.h"
+#include "sbr/mime_type.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 4c177d1..9b410e2 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -15,8 +15,8 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 438f8a6..672d830 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -11,9 +11,9 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 #include <h/signals.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
-#include "../sbr/mime_type.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/mime_type.h"
 #include "mhmisc.h"
 #include "mhfree.h"
 #include "mhoutsbr.h"

diff --git a/uip/mhfree.c b/uip/mhfree.c
index 1bb488d..936c94c 100644 (file)
--- a/uip/mhfree.c
+++ b/uip/mhfree.c
@@ -10,7 +10,7 @@
 #include <h/utils.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 
 /* The list of top-level contents to display */

diff --git a/uip/mhlist.c b/uip/mhlist.c
index bc8e2a2..2604506 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -16,7 +16,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHLIST_SWITCHES \

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 3e10f99..e78ae68 100644 (file)
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -12,7 +12,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/oauth.h>
-#include "../sbr/lock_file.h"
+#include "sbr/lock_file.h"
 
 #define MHLOGIN_SWITCHES \
     X("user username", 0, USERSW) \

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index d32d38f..5ff3f4d 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -11,10 +11,10 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/m_popen.h"
+#include "sbr/m_popen.h"
 #include <setjmp.h>
 #include <sys/types.h>
-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"
 
 /*
  * MAJOR BUG:

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 380d7ea..acaae82 100644 (file)
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -9,7 +9,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
-#include "../sbr/makedir.h"
+#include "sbr/makedir.h"
 #include "mhmisc.h"
 
 extern int debugsw;

diff --git a/uip/mhn.c b/uip/mhn.c
index 68def2b..811a4ac 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -17,7 +17,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index a9735d0..4a3166f 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -15,7 +15,7 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include "mhoutsbr.h"
-#include "../sbr/base64.h"
+#include "sbr/base64.h"
 
 
 /*

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 716f390..c42d1c3 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -15,12 +15,12 @@
 #include <h/utils.h>
 #include "mhmisc.h"
 #include <h/mhcachesbr.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include "mhfree.h"
 #ifdef HAVE_ICONV
 # include <iconv.h>
 #endif /* HAVE_ICONV */
-#include "../sbr/base64.h"
+#include "sbr/base64.h"
 
 
 extern int debugsw;

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 1b5fd3b..abf6b01 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define MHPATH_SWITCHES \
     X("version", 0, VERSIONSW) \

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 786c0b6..e01091e 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -17,8 +17,8 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_popen.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_popen.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 3b54a4c..ebb295b 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -17,7 +17,7 @@
 #include <h/utils.h>
 #include "mhmisc.h"
 #include "mhshowsbr.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #ifdef HAVE_ICONV
 #   include <iconv.h>
 #endif /* ! HAVE_ICONV */

diff --git a/uip/mhstore.c b/uip/mhstore.c
index b8feba9..80eddb2 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -16,7 +16,7 @@
 #include <h/mhcachesbr.h>
 #include <h/utils.h>
 #include "mhmisc.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 #include "mhfree.h"
 
 #define MHSTORE_SWITCHES \

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 4052a67..32d23c5 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -16,8 +16,8 @@
 #include <h/utils.h>
 #include "mhmisc.h"
 #include "mhshowsbr.h"
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 enum clobber_policy_t {
   NMH_CLOBBER_ALWAYS = 0,

diff --git a/uip/new.c b/uip/new.c
index a787806..c1c7999 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -14,8 +14,8 @@
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 #include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_maildir.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_maildir.h"
 
 #define NEW_SWITCHES \
     X("mode", 1, MODESW) \

diff --git a/uip/packf.c b/uip/packf.c
index 2424c97..94a18ef 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <h/dropsbr.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define PACKF_SWITCHES \
     X("file name", 0, FILESW) \

diff --git a/uip/pick.c b/uip/pick.c
index 596133a..1084a47 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -9,7 +9,7 @@
 #include <h/tws.h>
 #include <h/picksbr.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define PICK_SWITCHES \
     X("reverse", 0, REVSW) \

diff --git a/uip/popsbr.c b/uip/popsbr.c
index c5af09d..ecf1aa3 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -12,7 +12,7 @@
 
 #include <h/popsbr.h>
 #include <h/signals.h>
-#include "../sbr/base64.h"
+#include "sbr/base64.h"
 
 #define        TRM     "."
 

diff --git a/uip/post.c b/uip/post.c
index f772688..69fe6b8 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -15,8 +15,8 @@
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
-#include "../sbr/m_mktemp.h"
-#include "../sbr/message_id.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/message_id.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>

diff --git a/uip/prompter.c b/uip/prompter.c
index e5170df..224734e 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include <setjmp.h>
 
 #include <termios.h>

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 35bbfb7..a75e21a 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -11,7 +11,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 
 #define RCVDIST_SWITCHES \
     X("form formfile", 4, FORMSW) \

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 660d7ce..6f82f81 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,9 +10,9 @@
 #include <h/signals.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
-#include "../sbr/makedir.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/makedir.h"
 
 #define RCVSTORE_SWITCHES \
     X("create", 0, CRETSW) \

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 1e28623..101aa5a 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -18,7 +18,7 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #ifdef HAVE_GETUTXENT

diff --git a/uip/refile.c b/uip/refile.c
index 84ef6f0..bed5cba 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -8,8 +8,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #define REFILE_SWITCHES \

diff --git a/uip/repl.c b/uip/repl.c
index 2707b36..2979dd9 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define REPL_SWITCHES \
     X("group", 0, GROUPSW) \

diff --git a/uip/rmf.c b/uip/rmf.c
index 5450fd6..e8fa45f 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -7,8 +7,8 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #define RMF_SWITCHES \
     X("interactive", 0, INTRSW) \

diff --git a/uip/rmm.c b/uip/rmm.c
index 64fe272..fa5fe5b 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -7,7 +7,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define RMM_SWITCHES \
     X("unlink", 0, UNLINKSW) \

diff --git a/uip/scan.c b/uip/scan.c
index b65fef7..c62be0f 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -11,8 +11,8 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/terminal.h"
+#include "sbr/m_maildir.h"
+#include "sbr/terminal.h"
 
 #define SCAN_SWITCHES \
     X("clear", 0, CLRSW) \

diff --git a/uip/scansbr.c b/uip/scansbr.c
index bbc5a16..457379c 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -11,7 +11,7 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/terminal.h"
+#include "sbr/terminal.h"
 
 static struct format *fmt;
 static struct comp *datecomp;          /* pntr to "date" comp             */

diff --git a/uip/send.c b/uip/send.c
index 297b8f0..1f419f5 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -11,8 +11,8 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 0d13b52..3fd30f3 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -24,9 +24,9 @@
 #ifdef OAUTH_SUPPORT
 #include <h/oauth.h>
 #endif
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
-#include "../sbr/message_id.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/message_id.h"
 
 #ifdef OAUTH_SUPPORT
 static int setup_oauth_params(char *[], int *, const char *, const char **);

diff --git a/uip/show.c b/uip/show.c
index 55707da..86e8e5b 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/mime.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define SHOW_SWITCHES \
     X("checkmime", 0, CHECKMIMESW) \

diff --git a/uip/slocal.c b/uip/slocal.c
index d856803..723cb27 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -27,8 +27,8 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/utils.h>
-#include "../sbr/lock_file.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"
 
 #include <pwd.h>
 #include <sys/ioctl.h>

diff --git a/uip/sortm.c b/uip/sortm.c
index 7e966db..1546f75 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/tws.h>
 #include <h/utils.h>
-#include "../sbr/m_maildir.h"
+#include "sbr/m_maildir.h"
 
 #define SORTM_SWITCHES \
     X("datefield field", 0, DATESW) \

diff --git a/uip/viamail.c b/uip/viamail.c
index 2104686..db93066 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -13,8 +13,8 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
-#include "../sbr/base64.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/base64.h"
 
 #define VIAMAIL_SWITCHES \
     X("to mailpath", 0, TOSW) \

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index f06d4b3..72b315f 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -44,9 +44,9 @@
 #ifdef OAUTH_SUPPORT
 # include <h/oauth.h>
 #endif
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
-#include "../sbr/mime_type.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/mime_type.h"
 
 #define WHATNOW_SWITCHES \
     X("draftfolder +folder", 0, DFOLDSW) \

diff --git a/uip/whom.c b/uip/whom.c
index 542e67f..145190b 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -8,8 +8,8 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/signals.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)