clean up downloading and configure script

1 files changed, 9 insertions, 5 deletions

diff --git a/snag/configure b/snag/configure
index d5493e1..9613843 100755
--- a/snag/configure
+++ b/snag/configure
@@ -1,27 +1,31 @@
 #!/bin/sh
 
+# temp for testing
+mkdir -p ./var/snag/{downloads,installs,builds}
+ln -s ../../../packages/ ./var/snag/packages
+
 bin="snag"
 libs="libcurl libcrypto"
 builddir="build"
 
-CFLAGS=${CFLAGS:-""}
+CFLAGS="$CFLAGS $(pkg-config --cflags $libs)"${CFLAGS:-""}
 
 CFLAGS_RELEASE="$CFLAGS -O2"
 CFLAGS_DEBUG="$CFLAGS -Wall -g -DDEBUG=1"
 
 write() { echo "$@" >> build.ninja; }
 
-echo "$CFLAGS_DEBUG $(pkg-config --cflags $libs)" | tr ' ' '\n' > compile_flags.txt
+echo "$CFLAGS_DEBUG" | tr ' ' '\n' > compile_flags.txt
 rm -f build.ninja
 
 write "builddir = $builddir"
-write "libs = $(pkg-config --libs $libs)"
+write "linkflags = $(pkg-config --libs $libs)"
 
 write 'rule link'
 write '  description = LD $out'
-write '  command = gcc $libs $in -o $out'
+write '  command = gcc $linkflags $in -o $out'
 for target in $(echo "debug release"); do
-    eval write "cflags_$target = \$CFLAGS_$(echo $target | tr 'a-z' 'A-Z') $(pkg-config --cflags $libs)"
+    eval write "cflags_$target = \$CFLAGS_$(echo $target | tr 'a-z' 'A-Z')"
 
     write "rule cc-$target"
     write '  deps = gcc'