From 7586095504f238a35937426aa870cb6d2a7b2862 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Oct 2012 16:54:40 -0400
Subject: Remove bin2c

---
 src/libstore/Makefile.am    | 2 +-
 src/libstore/local-store.cc | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/libstore')

diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index 3356557970a2..cb522d6bf856 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -29,4 +29,4 @@ AM_CXXFLAGS = -Wall \
 local-store.lo: schema.sql.hh
 
 %.sql.hh: %.sql
-	../bin2c/bin2c schema < $< > $@ || (rm $@ && exit 1)
+	sed -e 's/"/\\"/g' -e 's/.*/"\0\\n"/' < $< > $@ || (rm $@ && exit 1)
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 982644af7154..251449089796 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -374,7 +374,9 @@ void LocalStore::openDB(bool create)
 
     /* Initialise the database schema, if necessary. */
     if (create) {
+        const char * schema =
 #include "schema.sql.hh"
+            ;
         if (sqlite3_exec(db, (const char *) schema, 0, 0, 0) != SQLITE_OK)
             throwSQLiteError(db, "initialising database schema");
     }
-- 
cgit 1.4.1