instow

commit 993827098637aa9debd8468cc4040860ca697d8f
parent be73b033b617adf7f9c5e9b151b931aa488ebce4
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date:   Wed, 25 Mar 2026 20:02:11 +0100

Proper c library handling

Diffstat:
M
bootstrap.sh
 | 
6
+++---
M
src/main.janet
 | 
34
+++++++++++++++++++---------------

2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -4,10 +4,10 @@ set -e
 
 BOOTDIR="$PWD"
 
-PREFIX="${PREFIX:-$HOME/.instow}"
+PREFIX="${PREFIX:-$HOME/.usr/local/}"
 
-SRCDIR="${SRCDIR:-$PREFIX/stw/src}"
-PKGDIR="${PKGDIR:-$PREFIX/stw/pkg}"
+SRCDIR="${SRCDIR:-$HOME/.usr/src/}"
+PKGDIR="${PKGDIR:-$PREFIX/stow}"
 
 PATH="$PATH:$PREFIX/bin"
 
diff --git a/src/main.janet b/src/main.janet
@@ -75,8 +75,12 @@
 
 (defn main [& args]
     (def home (os/getenv "HOME"))
-    (def target (path/join home ".instow"))
-    (def stowdir (path/join target "stw" "pkg"))
+    (def target (path/join home ".usr" "local"))
+    (def bindir (path/join target "bin"))
+    (def mandir (path/join target "share" "man"))
+    (def headerdir (path/join target "include"))
+    (def libdir  (path/join target "lib"))
+    (def stowdir (path/join target "stow"))
     (def pkg (libc/basename (os/getenv "PWD")))
     (def pkgdir (path/join stowdir pkg))
     (def destdir (libc/mkdtemp "/tmp/instow.XXXXXX"))
@@ -84,14 +88,14 @@
     (def env (os/environ))
     (merge-into env {:err :pipe
                      :out :pipe
-                     "PATH" (string/join [(os/getenv "PATH") (path/join target "bin")] ":")
-                     "PKG_CONFIG_PATH" (path/join target "lib" "pkgconfig")
-                     "CFLAGS" (string/join ["-idirafter" (path/join target "include")] " ")
-                     "PERL5LIB" (path/join target "lib" "perl5")
-                     "GOPATH" destdir
-                     "CC" (os/getenv "CC")
-                     "CXX" (os/getenv "CXX")
-                     "CFLAGS" (os/getenv "CFLAGS")})
+                     "PATH" (string/join [(os/getenv "PATH") bindir] ":")
+                     "PKG_CONFIG_PATH" (path/join libdir "pkgconfig")
+                     "CFLAGS" (string/join
+                                [(stropt "--include-directory-after" headerdir)
+                                (stropt "-Wl,-rpath" libdir)
+                                (stropt "--library-directory" libdir)] " ")
+                     "PERL5LIB" (path/join libdir "perl5")
+                     "GOPATH" destdir})
 
     (var ret 0)
     (var state (if-let [st (get args 1)] (keyword st) :init))
@@ -201,11 +205,11 @@
         (checkrun :move
                   :jpm
                   (stropt "--dest-dir" destdir)
-                  (stropt "--binpath" (path/join prefix "bin"))
-                  (stropt "--manpath" (path/join prefix "share" "man" "man1"))
-                  (stropt "--modpath" (path/join prefix "lib" "janet"))
-                  (stropt "--libpath" (path/join prefix "lib"))
-                  (stropt "--headerpath" (path/join prefix "include" "janet"))
+                  (stropt "--binpath" bindir)
+                  (stropt "--manpath" (path/join mandir "man1"))
+                  (stropt "--modpath" (path/join libdir "janet"))
+                  (stropt "--libpath" libdir)
+                  (stropt "--headerpath" (path/join headerdir "janet"))
                   "install")
 
         :install/cargo