From 83f1e3aa3d04f3c52133b8c06511507f994d07bb Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 27 Jan 2022 21:47:25 +0100
Subject: [PATCH] Little bit of cleanup [CI SKIP]

---
 .woodpecker/.builder.yml |  1 -
 Makefile                 | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.woodpecker/.builder.yml b/.woodpecker/.builder.yml
index 75f52671..55d83d5c 100644
--- a/.woodpecker/.builder.yml
+++ b/.woodpecker/.builder.yml
@@ -15,4 +15,3 @@ pipeline:
       path:
         - Dockerfile.builder
         - patches/*
-        - Makefile
diff --git a/Makefile b/Makefile
index db630218..c363c8a8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,8 @@
 SRC_DIR := src
 SOURCES != find '$(SRC_DIR)' -iname '*.v'
 
-LARCHIVE_VER := 3.5.2
-LARCHIVE_DIR := libarchive-$(LARCHIVE_VER)
-LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so
-
 V_RELEASE := weekly.2022.04
 V_PATH ?= v-$(V_RELEASE)/v
-
-# Custom V command for linking libarchive
-# V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)'
 V := $(V_PATH) -showcc
 
 all: vieter
@@ -32,6 +25,7 @@ prod: pvieter
 pvieter: $(SOURCES)
 	$(V) -o pvieter -prod $(SRC_DIR)
 
+# Only generate C code
 .PHONY: c
 c:
 	$(V) -o vieter.c $(SRC_DIR)
@@ -45,12 +39,12 @@ run: vieter
 
 .PHONY: run-prod
 run-prod: prod
-	 API_KEY=test REPO_DIR=data LOG_LEVEL=DEBUG ./pvieter
+	API_KEY=test DOWNLOAD_DIR=data/downloads REPO_DIR=data/repo PKG_DIR=data/pkgs LOG_LEVEL=DEBUG ./pvieter
 
 # Same as run, but restart when the source code changes
 .PHONY: watch
 watch:
-	API_KEY=test REPO_DIR=data LOG_LEVEL=DEBUG $(V) watch run vieter
+	API_KEY=test DOWNLOAD_DIR=data/downloads REPO_DIR=data/repo PKG_DIR=data/pkgs LOG_LEVEL=DEBUG $(V) watch run vieter
 
 
 # =====OTHER=====