From 4b872828a5ad2ae4e4938e9c2addc3a8801b406a Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Tue, 10 Aug 2021 22:07:48 -0400
Subject: [PATCH] Use OUT_DIR

---
 .gitignore         | 1 -
 build.rs           | 6 ++----
 src/.gitignore     | 1 -
 src/schemas/mod.rs | 1 +
 4 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 src/.gitignore
 create mode 100644 src/schemas/mod.rs

diff --git a/.gitignore b/.gitignore
index 9ab3c2f..2852c96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /target
 **/*.rs.bk
 scratch/
-src/schemas/**/*.rs
diff --git a/build.rs b/build.rs
index ac855f4..c9f2596 100644
--- a/build.rs
+++ b/build.rs
@@ -1,9 +1,7 @@
 use preserves_schema::compiler::*;
 
-use std::io::Error;
-
-fn main() -> Result<(), Error> {
-    let buildroot = std::env::current_dir()?;
+fn main() -> std::io::Result<()> {
+    let buildroot = std::path::PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
 
     let mut gen_dir = buildroot.clone();
     gen_dir.push("src/schemas");
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index c75f615..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-schemas/
diff --git a/src/schemas/mod.rs b/src/schemas/mod.rs
new file mode 100644
index 0000000..ff86a90
--- /dev/null
+++ b/src/schemas/mod.rs
@@ -0,0 +1 @@
+include!(concat!(env!("OUT_DIR"), "/src/schemas/mod.rs"));