Include "rpmmacro.h" instead of <rpmmacro.h>.

diff --git a/lib/depends.c b/lib/depends.c
index 2e372fd..5b41012 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -6,7 +6,7 @@
 
 #include <rpmcli.h>            /* XXX rpmcliPackagesTotal */
 
-#include <rpmmacro.h>          /* XXX rpmExpand("%{_dependency_whiteout}" */
+#include "rpmmacro.h"          /* XXX rpmExpand("%{_dependency_whiteout}" */
 
 #include "rpmdb.h"
 #include "rpmdb_internal.h"    /* XXX response cache needs dbiOpen et al. */

diff --git a/lib/formats.c b/lib/formats.c
index 76b3e33..6b6d013 100644 (file)
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -5,7 +5,7 @@
 #include "system.h"
 #include "rpmio_internal.h"
 #include <rpmlib.h>
-#include <rpmmacro.h>  /* XXX for %_i18ndomains */
+#include "rpmmacro.h"  /* XXX for %_i18ndomains */
 
 #include <rpmfi.h>
 

diff --git a/lib/fs.c b/lib/fs.c
index 86a81dc..3756594 100644 (file)
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 #include <rpmlib.h>
-#include <rpmmacro.h>  /* XXX for rpmGetPath */
+#include "rpmmacro.h"  /* XXX for rpmGetPath */
 #include "rpmerr.h"
 #include "debug.h"
 

diff --git a/lib/manifest.c b/lib/manifest.c
index d0b0744..4ded1a9 100644 (file)
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -6,7 +6,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 
 #include "stringbuf.h"
 #include "manifest.h"

diff --git a/lib/misc.c b/lib/misc.c
index 4f3a379..747bd56 100644 (file)
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -8,7 +8,7 @@
 const char * RPMVERSION = VERSION;
 
 #include "rpmurl.h"
-#include <rpmmacro.h>  /* XXX for rpmGetPath */
+#include "rpmmacro.h"  /* XXX for rpmGetPath */
 #include <rpmlib.h>
 #include "rpmerr.h"
 #include "legacy.h"

diff --git a/lib/psm.c b/lib/psm.c
index 60ee7de..e65bb82 100644 (file)
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -7,7 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmurl.h"
 #include <rpmlua.h>
 

diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 7f3be9c..fd2c302 100644 (file)
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -11,7 +11,7 @@
 #include <rpmgi.h>
 
 #include <rpmdb.h>
-#include <rpmmacro.h>          /* XXX rpmExpand */
+#include "rpmmacro.h"          /* XXX rpmExpand */
 #include "manifest.h"
 #include "rpmerr.h"
 

diff --git a/lib/rpmlock.c b/lib/rpmlock.c
index 2d2a575..33d8863 100644 (file)
--- a/lib/rpmlock.c
+++ b/lib/rpmlock.c
@@ -2,7 +2,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 
 #include "rpmts.h"
 #include "rpmlock.h"

diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 9ff3f56..5cd9bcc 100644 (file)
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -15,7 +15,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include <rpmlua.h>
 
 #include "rpmerr.h"

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 10da272..5806907 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -6,7 +6,7 @@
 
 #include "rpmio_internal.h"    /* XXX for pgp and beecrypt */
 #include <rpmlib.h>
-#include <rpmmacro.h>          /* XXX rpmtsOpenDB() needs rpmGetPath */
+#include "rpmmacro.h"          /* XXX rpmtsOpenDB() needs rpmGetPath */
 
 #include "rpmdb.h"
 

diff --git a/lib/signature.c b/lib/signature.c
index 89a33cd..cf6a9a2 100644 (file)
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -6,7 +6,7 @@
 
 #include "rpmio_internal.h"
 #include <rpmlib.h>
-#include <rpmmacro.h>  /* XXX for rpmGetPath() */
+#include "rpmmacro.h"  /* XXX for rpmGetPath() */
 #include "rpmdb.h"
 
 #include "rpmts.h"

diff --git a/lib/tcpu.c b/lib/tcpu.c
index 0e22da8..bc0fad5 100644 (file)
--- a/lib/tcpu.c
+++ b/lib/tcpu.c
@@ -1,7 +1,7 @@
 #include "system.h"
 #include <rpmio_internal.h>
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "debug.h"
 
 #define        _PROC_CPUINFO   "/proc/cpuinfo"

diff --git a/lib/tgi.c b/lib/tgi.c
index 03954c8..1d4234b 100644 (file)
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -5,7 +5,7 @@
 
 #include <rpmte.h>
 
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <fts.h>
 #include <popt.h>

diff --git a/lib/tplatform.c b/lib/tplatform.c
index 74e0dc4..c64c6f6 100644 (file)
--- a/lib/tplatform.c
+++ b/lib/tplatform.c
@@ -2,7 +2,7 @@
 
 #include "rpmio_internal.h"
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include <rpmio.h>
 
 #define        _ETC_RPM_PLATFORM       "/etc/rpm/platform"

diff --git a/lib/transaction.c b/lib/transaction.c
index 5d33d73..0217215 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -5,7 +5,7 @@
 #include "system.h"
 #include <rpmlib.h>
 
-#include <rpmmacro.h>  /* XXX for rpmExpand */
+#include "rpmmacro.h"  /* XXX for rpmExpand */
 
 #include "fsm.h"
 #include "psm.h"

diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index ab3ccbf..caf8546 100644 (file)
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -11,7 +11,7 @@ static int _debug = 1;        /* XXX if < 0 debugging, > 0 unusual error returns */
 #endif
 
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmurl.h"    /* XXX urlPath proto */
 
 #include <rpmdb_internal.h>

diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 89ef32a..ab57544 100644 (file)
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 
 #include "rpmerr.h"
 #include "rpmdb_internal.h"

diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c
index b2bdddc..b701a98 100644 (file)
--- a/rpmdb/fprint.c
+++ b/rpmdb/fprint.c
@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include "rpmdb_internal.h"
-#include <rpmmacro.h>  /* XXX for rpmCleanPath */
+#include "rpmmacro.h"  /* XXX for rpmCleanPath */
 
 #include "fprint.h"
 #include "debug.h"

diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index 0f8ee48..8b3145f 100644 (file)
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -20,7 +20,7 @@
 #include "rpmio_internal.h"
 #include "rpmlead.h"
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "misc.h"
 #include "legacy.h"
 #include "debug.h"

diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index ba393ec..ea8404d 100644 (file)
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -15,7 +15,7 @@
 #include <regex.h>
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmsq.h"
 
 #include "rpmerr.h"

diff --git a/rpmdb/sqlite.c b/rpmdb/sqlite.c
index e5b0515..e810c7f 100644 (file)
--- a/rpmdb/sqlite.c
+++ b/rpmdb/sqlite.c
@@ -27,7 +27,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmurl.h"     /* XXX urlPath proto */
 
 #include "rpmdb_internal.h"

diff --git a/rpmio/macro.c b/rpmio/macro.c
index 82bab22..ebda04e 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -49,7 +49,7 @@ typedef       FILE * FD_t;
 
 #endif
 
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 
 #include "debug.h"
 

diff --git a/rpmio/rpmlua.c b/rpmio/rpmlua.c
index 27d6c48..829e82c 100644 (file)
--- a/rpmio/rpmlua.c
+++ b/rpmio/rpmlua.c
@@ -2,7 +2,7 @@
 
 #ifdef WITH_LUA
 #include <rpmio.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include <rpmerr.h>
 #include "rpmurl.h"
 #include <rpmhook.h>

diff --git a/rpmio/tdir.c b/rpmio/tdir.c
index 0349cb7..7e5f2ba 100644 (file)
--- a/rpmio/tdir.c
+++ b/rpmio/tdir.c
@@ -1,7 +1,7 @@
 #include "system.h"
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <popt.h>
 

diff --git a/rpmio/tfts.c b/rpmio/tfts.c
index 90b39e5..03fb298 100644 (file)
--- a/rpmio/tfts.c
+++ b/rpmio/tfts.c
@@ -2,7 +2,7 @@
 #include <fts.h>
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <popt.h>
 

diff --git a/rpmio/tget.c b/rpmio/tget.c
index d21a3ca..4a46d50 100644 (file)
--- a/rpmio/tget.c
+++ b/rpmio/tget.c
@@ -1,7 +1,7 @@
 #include "system.h"
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <popt.h>
 

diff --git a/rpmio/tglob.c b/rpmio/tglob.c
index e8b5d10..9cb3b70 100644 (file)
--- a/rpmio/tglob.c
+++ b/rpmio/tglob.c
@@ -1,7 +1,7 @@
 #include "system.h"
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <popt.h>
 

diff --git a/rpmio/thkp.c b/rpmio/thkp.c
index 8b43231..ae5a360 100644 (file)
--- a/rpmio/thkp.c
+++ b/rpmio/thkp.c
@@ -1,7 +1,7 @@
 #include "system.h"
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <popt.h>
 

diff --git a/rpmio/tput.c b/rpmio/tput.c
index ca04951..846e9d6 100644 (file)
--- a/rpmio/tput.c
+++ b/rpmio/tput.c
@@ -1,7 +1,7 @@
 #include "system.h"
 
 #include <rpmio_internal.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include <popt.h>
 

diff --git a/rpmio/url.c b/rpmio/url.c
index dae32fb..34ce7ab 100644 (file)
--- a/rpmio/url.c
+++ b/rpmio/url.c
@@ -6,7 +6,7 @@
 
 #include <netinet/in.h>
 
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmmessages.h"
 #include "rpmurl.h"
 #include "rpmio.h"

diff --git a/tools/convertdb1.c b/tools/convertdb1.c
index 1470af6..14c5e20 100644 (file)
--- a/tools/convertdb1.c
+++ b/tools/convertdb1.c
@@ -10,7 +10,7 @@ const char *__progname;
 #include <rpmlib.h>
 #include <rpmdb.h>
 #include <rpmio.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include <rpmdb/legacy.h>
 
 #define FA_MAGIC      0x02050920

diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index ad66c6b..42122f2 100644 (file)
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -2,7 +2,7 @@
 const char *__progname;
 
 #include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 #include "rpmurl.h"
 
 #include "rpmdb.h"