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

24 files changed, 31 insertions, 31 deletions

diff --git a/rpmio/base64.c b/rpmio/base64.c
index b11b3816b..8daa16c12 100644
--- a/rpmio/base64.c
+++ b/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)
 {
diff --git a/rpmio/digest.c b/rpmio/digest.c
index 263754f94..3e9231616 100644
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -3,7 +3,7 @@
  */
 
 #include "system.h"
-#include "digest.h"
+#include "rpmio/digest.h"
 #include "debug.h"
 
 #ifdef	SHA_DEBUG
diff --git a/rpmio/digest.h b/rpmio/digest.h
index 563f2da4b..1519baeb6 100644
--- a/rpmio/digest.h
+++ b/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>
diff --git a/rpmio/fts.c b/rpmio/fts.c
index 7b86f2643..ec5b1d672 100644
--- a/rpmio/fts.c
+++ b/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)
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 51ef69d4a..4a7fa0d03 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -20,7 +20,7 @@
 #include <rpmlog.h>
 
 #ifdef	WITH_LUA
-#include "rpmlua.h"
+#include "rpmio/rpmlua.h"
 #endif
 
 #include <rpmmacro.h>
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c
index 7affe1783..3500a8edf 100644
--- a/rpmio/rpmfileutil.c
+++ b/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>
diff --git a/rpmio/rpmhook.c b/rpmio/rpmhook.c
index 793554203..3d07d09e8 100644
--- a/rpmio/rpmhook.c
+++ b/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
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 33ddfa6a3..8cf969810 100644
--- a/rpmio/rpmio.c
+++ b/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>
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 24dfe1176..f60f02f53 100644
--- a/rpmio/rpmio.h
+++ b/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>
diff --git a/rpmio/rpmio_internal.h b/rpmio/rpmio_internal.h
index ba74cba81..43d08da8a 100644
--- a/rpmio/rpmio_internal.h
+++ b/rpmio/rpmio_internal.h
@@ -12,7 +12,7 @@
 
 #include <rpmpgp.h>
 #include <rpmsw.h>
-#include "digest.h"
+#include "rpmio/digest.h"
 
 /** \ingroup rpmio
  */
diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.c
index c3770f537..142613ca5 100644
--- a/rpmio/rpmlua.c
+++ b/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"
 
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index ec06bce6c..1949b0b4d 100644
--- a/rpmio/rpmpgp.c
+++ b/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>
 
diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index 1f0434a95..3b3d467a9 100644
--- a/rpmio/rpmrpc.c
+++ b/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"
 
 /* =============================================================== */
diff --git a/rpmio/tax.c b/rpmio/tax.c
index 774bc4ac0..2f0f6407d 100644
--- a/rpmio/tax.c
+++ b/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"
diff --git a/rpmio/tdir.c b/rpmio/tdir.c
index 05550b78c..d2812f851 100644
--- a/rpmio/tdir.c
+++ b/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>
diff --git a/rpmio/tfts.c b/rpmio/tfts.c
index 6baa97596..db2883e73 100644
--- a/rpmio/tfts.c
+++ b/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>
diff --git a/rpmio/tget.c b/rpmio/tget.c
index 704c78e97..40adc4a3a 100644
--- a/rpmio/tget.c
+++ b/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>
diff --git a/rpmio/tglob.c b/rpmio/tglob.c
index 526dac332..9f8b7d6e1 100644
--- a/rpmio/tglob.c
+++ b/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>
diff --git a/rpmio/thkp.c b/rpmio/thkp.c
index 164116f5e..4b06c129b 100644
--- a/rpmio/thkp.c
+++ b/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>
diff --git a/rpmio/tkey.c b/rpmio/tkey.c
index 55b463549..b6f01c0da 100644
--- a/rpmio/tkey.c
+++ b/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)
diff --git a/rpmio/tput.c b/rpmio/tput.c
index ecb1d8ec3..87810d4a8 100644
--- a/rpmio/tput.c
+++ b/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>
diff --git a/rpmio/tring.c b/rpmio/tring.c
index 05c38a7af..713360adc 100644
--- a/rpmio/tring.c
+++ b/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"
 
diff --git a/rpmio/tufdio.c b/rpmio/tufdio.c
index 53991c654..82333d1ee 100644
--- a/rpmio/tufdio.c
+++ b/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>
diff --git a/rpmio/ugid.c b/rpmio/ugid.c
index fb84f746d..32d7387fd 100644
--- a/rpmio/ugid.c
+++ b/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