Integrate new build-time variables

2 files changed, 15 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 5de0176..50e2560 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,8 @@ export LIBS             ?=
 
 export __CFLAGS := -std=c99 -Wall \
                    -DFTAG_PREFIX=\"$(PREFIX)\" \
+                   -DFTAG_CACHE_DIR=\"$(FTAG_CACHE_DIR)\" \
+                   -DFTAG_CONFIG_DIR=\"$(FTAG_CONFIG_DIR)\" \
                    -D_POSIX_C_SOURCE=200809L \
                    $(shell pkg-config --cflags sqlite3)
 export __LIBS   := $(shell pkg-config --libs sqlite3)
diff --git a/src/main.c b/src/main.c
index 34deddb..4214832 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,7 @@
 #define FTAG_REMOTE_ROOT "ftag"
 #endif
 
-#define DATABASE_PATH (FTAG_ROOT "/ftag.sqlite3")
+#define DATABASE_PATH FTAG_CACHE_DIR "/ftag.sqlite3"
 
 /* Used when encrypting or decrpyting a file, see the copy_encrypted_file
  * function. */
@@ -433,7 +433,7 @@ static void ftag_file_get_extension(char *out, int size, const char *file)
 static void ftag_file_get_path(char *out, int size, const char *file)
 {
 	/* look for the encrypted version first */
-	strbuild_with_size(out, size, "%s/files/%s.gpg", FTAG_ROOT, file);
+	strbuild_with_size(out, size, "%s/files/%s.gpg", FTAG_CACHE_DIR, file);
 	if (file_exists(out))
 		return;
 	/* look for the clear version after */
@@ -530,21 +530,21 @@ static void ftag_export(int argc, char **argv)
 /* Create ftag's database and directories. */
 static void ftag_init(int, char **)
 {
-	int rc = mkdir(FTAG_ROOT, 0755);
+	int rc = mkdir(FTAG_CACHE_DIR, 0755);
 	if (rc == -1) {
-		fprintf(stderr, "mkdir: %s: ", FTAG_ROOT);
+		fprintf(stderr, "mkdir: %s: ", FTAG_CACHE_DIR);
 		perror("");
 		exit(EXIT_FAILURE);
 	}
-	rc = mkdir(FTAG_ROOT "/files", 0755);
+	rc = mkdir(FTAG_CACHE_DIR "/files", 0755);
 	if (rc == -1) {
-		fprintf(stderr, "mkdir: %s/files: ", FTAG_ROOT);
+		fprintf(stderr, "mkdir: %s/files: ", FTAG_CACHE_DIR);
 		perror("");
 		exit(EXIT_FAILURE);
 	}
 	char cmd_sqlite[1024];
 	strbuild(cmd_sqlite, "sqlite3 %s < %s",
-		 DATABASE_PATH, FTAG_ROOT "/sql/init.sql");
+		 DATABASE_PATH, FTAG_PREFIX "/share/ftag/sql/init.sql");
 	char *cmd[] = {
 		"sh",
 		"-c",
@@ -699,11 +699,11 @@ ftag_add_one_file(sqlite3 *db, int *next_id, const char *file, uint32_t file_sum
 
 	char new_path[512];
 	if (encrypt) {
-		strbuild(new_path, "%s/files/%s.gpg", FTAG_ROOT, canonical_name);
+		strbuild(new_path, "%s/files/%s.gpg", FTAG_CACHE_DIR, canonical_name);
 		copy_file_with_encryption(file, new_path, ENCRYPT);
 	}
 	else {
-		strbuild(new_path, "%s/files/%s", FTAG_ROOT, canonical_name);
+		strbuild(new_path, "%s/files/%s", FTAG_CACHE_DIR, canonical_name);
 		copy_file(file, new_path);
 	}
 
@@ -961,9 +961,9 @@ static void ftag_help(int, char **)
 	puts("  tag     manage tags");
 	puts("Some commands also have their own help, try \"ftag COMMAND help\"");
 	puts("Configuration:");
-	printf("  root          %s\n", FTAG_ROOT "/");
+	printf("  root          %s\n", FTAG_CACHE_DIR "/");
 	printf("  database      %s\n", DATABASE_PATH);
-	printf("  file storage  %s\n", FTAG_ROOT "/files/");
+	printf("  file storage  %s\n", FTAG_CACHE_DIR "/files/");
 }
 
 static void ftag_query_usage(void)
@@ -1166,9 +1166,9 @@ static void ftag_sync_run_rsync(int push)
 	strbuild(remote_root, "%s:%s/",
 		 FTAG_REMOTE_HOST, FTAG_REMOTE_ROOT);
 	char *first = remote_root;
-	char *second = FTAG_ROOT "/";
+	char *second = FTAG_CACHE_DIR "/";
 	if (push) {
-		first = FTAG_ROOT "/";
+		first = FTAG_CACHE_DIR "/";
 		second = remote_root;
 	}
 	char *cmd[] = {