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

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. */

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>
 

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"
 

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"

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"

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>
 

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"
 

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"

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"

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"
 

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"

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"

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>

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"

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"

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>

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"

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"

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"

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"

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"

rpmio/macro.c

@@ -49,7 +49,7 @@ typedef	FILE * FD_t;
 
 #endif
 
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 
 #include "debug.h"
 

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>

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>
 

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>
 

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>
 

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>
 

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>
 

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>
 

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"

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

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"