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

build/files.c

@@ -11,12 +11,12 @@
 #include <regex.h>
 
 #include <rpmpgp.h>
-#include "rpmio_internal.h"	/* XXX rpmioSlurp */
-#include "fts.h"
+#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
+#include "rpmio/fts.h"
 
 #include <rpmbuild.h>
 
-#include "cpio.h"
+#include "lib/cpio.h"
 
 #include <argv.h>
 #include <rpmfc.h>
@@ -27,10 +27,10 @@
 #define	_RPMTE_INTERNAL		/* XXX rpmte init */
 #include <rpmte.h>
 
-#include "buildio.h"
+#include "build/buildio.h"
 
 #include <rpmfileutil.h>	/* rpmDoDigest() */
-#include "legacy.h"	/* XXX expandFileList, compressFileList */
+#include "rpmdb/legacy.h"	/* XXX expandFileList, compressFileList */
 #include <rpmlog.h>
 #include "debug.h"
 

build/pack.c

@@ -5,24 +5,24 @@
 
 #include "system.h"
 
-#include "rpmio_internal.h"	/* fdInitDigest, fdFiniDigest */
+#include "rpmio/rpmio_internal.h"	/* fdInitDigest, fdFiniDigest */
 #include <rpmbuild.h>
 
 #include <rpmps.h>
 
-#include "cpio.h"
-#include "fsm.h"
-#include "psm.h"
+#include "lib/cpio.h"
+#include "lib/fsm.h"
+#include "lib/psm.h"
 
 #define	_RPMFI_INTERNAL		/* XXX fi->fsm */
 #include <rpmfi.h>
 #include <rpmts.h>
 
-#include "buildio.h"
+#include "build/buildio.h"
 
-#include "legacy.h"	/* XXX providePackageNVR */
-#include "signature.h"
-#include "rpmlead.h"
+#include "rpmdb/legacy.h"	/* XXX providePackageNVR */
+#include "lib/signature.h"
+#include "lib/rpmlead.h"
 #include <rpmfileutil.h>
 #include <rpmlog.h>
 #include "debug.h"

build/parseScript.c

@@ -9,7 +9,7 @@
 #include <rpmlog.h>
 #include "debug.h"
 
-#include "rpmlua.h"
+#include "rpmio/rpmlua.h"
 
 /**
  */

build/poptBT.c

@@ -7,7 +7,7 @@
 
 #include <rpmbuild.h>
 
-#include "legacy.h"	/* XXX _noDirTokens */
+#include "rpmdb/legacy.h"	/* XXX _noDirTokens */
 #include <rpmlog.h>
 #include "debug.h"
 

build/spec.c

@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include "buildio.h"
+#include "build/buildio.h"
 #include <rpmds.h>
 #include <rpmfi.h>
 #include <rpmts.h>