Expand private include file names to be relative to $(top_srcdir)

rpmio/base64.c

@@ -3,7 +3,7 @@
 
 #include <arpa/inet.h>
 #include <stdlib.h>
-#include "base64.h"
+#include "rpmio/base64.h"
 
 static char base64_encode_value(char value_in)
 {

rpmio/digest.c

@@ -3,7 +3,7 @@
  */
 
 #include "system.h"
-#include "digest.h"
+#include "rpmio/digest.h"
 #include "debug.h"
 
 #ifdef	SHA_DEBUG

rpmio/digest.h

@@ -1,7 +1,7 @@
 #ifndef _RPMDIGEST_H
 #define _RPMDIGEST_H
 
-#include "base64.h"
+#include "rpmio/base64.h"
 #include <rpmpgp.h>
 
 #include <nss.h>

rpmio/fts.c

@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-#include "fts.h"
+#include "rpmio/fts.h"
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -63,7 +63,7 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
 #endif
 #include "system.h"
-#include "fts.h"
+#include "rpmio/fts.h"
 #include <rpmio.h>
 #include <rpmurl.h>
 #   define __set_errno(val) (*__errno_location ()) = (val)

rpmio/macro.c

@@ -20,7 +20,7 @@
 #include <rpmlog.h>
 
 #ifdef	WITH_LUA
-#include "rpmlua.h"
+#include "rpmio/rpmlua.h"
 #endif
 
 #include <rpmmacro.h>

rpmio/rpmfileutil.c

@@ -13,7 +13,7 @@
 
 #endif
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmfileutil.h>
 #include <rpmurl.h>
 #include <rpmmacro.h>

rpmio/rpmhook.c

@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "rpmhook.h"
+#include "rpmio/rpmhook.h"
 
 #define RPMHOOK_TABLE_INITSIZE  256
 #define RPMHOOK_BUCKET_INITSIZE 5

rpmio/rpmio.c

@@ -21,9 +21,9 @@ extern int h_errno;
 #define	IPPORT_HTTP	80
 #endif
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 
-#include "ugid.h"
+#include "rpmio/ugid.h"
 #include <rpmmessages.h>
 #include <argv.h>
 #include <rpmlog.h>

rpmio/rpmio.h

@@ -9,7 +9,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include "glob.h"
+#include "misc/glob.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

rpmio/rpmio_internal.h

@@ -12,7 +12,7 @@
 
 #include <rpmpgp.h>
 #include <rpmsw.h>
-#include "digest.h"
+#include "rpmio/digest.h"
 
 /** \ingroup rpmio
  */

rpmio/rpmlua.c

@@ -5,7 +5,7 @@
 #include <rpmmacro.h>
 #include <rpmlog.h>
 #include <rpmurl.h>
-#include "rpmhook.h"
+#include "rpmio/rpmhook.h"
 
 #include <lua.h>
 #include <lualib.h>
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 #define _RPMLUA_INTERNAL
-#include "rpmlua.h"
+#include "rpmio/rpmlua.h"
 
 #include "debug.h"
 

rpmio/rpmpgp.c

@@ -4,8 +4,8 @@
  */
 
 #include "system.h"
-#include "digest.h"
-#include "rpmio_internal.h"	/* XXX rpmioSlurp */
+#include "rpmio/digest.h"
+#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include <rpmstring.h>
 

rpmio/rpmrpc.c

@@ -10,9 +10,9 @@
 
 #include <rpmurl.h>
 #include <rpmstring.h>
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 
-#include "ugid.h"
+#include "rpmio/ugid.h"
 #include "debug.h"
 
 /* =============================================================== */

rpmio/tax.c

@@ -1,7 +1,7 @@
 #include "system.h"
                                                                                 
 #include <rpmpgp.h>
-#include "base64.h"
+#include "rpmio/base64.h"
 #include <popt.h>
 
 #include "debug.h"

rpmio/tdir.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
 #include <rpmmessages.h>
 #include <popt.h>

rpmio/tfts.c

@@ -1,7 +1,7 @@
 #include "system.h"
-#include "fts.h"
+#include "rpmio/fts.h"
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
 #include <rpmmessages.h>
 #include <popt.h>

rpmio/tget.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
 #include <rpmmessages.h>
 #include <popt.h>

rpmio/tglob.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
 #include <rpmmessages.h>
 #include <popt.h>

rpmio/thkp.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
 #include <rpmmessages.h>
 #include <popt.h>

rpmio/tkey.c

@@ -6,7 +6,7 @@
 static int _debug = 0;
 
 #include "system.h"
-#include "digest.h"
+#include "rpmio/digest.h"
 #include "debug.h"
 
 static int doit(const char *sig, pgpDig dig, int printing)

rpmio/tput.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
 #include <rpmmessages.h>
 #include <popt.h>

rpmio/tring.c

@@ -1,6 +1,6 @@
 #include "system.h"
-#include "digest.h"
-#include "rpmio_internal.h"	/* XX _*debug */
+#include "rpmio/digest.h"
+#include "rpmio/rpmio_internal.h"	/* XX _*debug */
 #include <popt.h>
 #include "debug.h"
 

rpmio/tufdio.c

@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include <rpmurl.h>
-#include "rpmio_internal.h"
+#include "rpmio/rpmio_internal.h"
 
 #include <stdarg.h>
 #include <err.h>

rpmio/ugid.c

@@ -3,7 +3,7 @@
  */
 
 #include "system.h"
-#include "ugid.h"
+#include "rpmio/ugid.h"
 #include "debug.h"
 
 /* unameToUid(), uidTouname() and the group variants are really poorly