diff --git a/Makefile.am b/Makefile.am
index 7fba0d0..0accd21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,5 @@
bin_SCRIPTS = scripts/msg
-# Handle substitution of fully-expanded Autoconf variables.
-do_subst = $(SED) \
- -e 's,[@]GUILE[@],$(GUILE),g' \
- -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \
- -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \
- -e 's,[@]localedir[@],$(localedir),g'
-
nodist_noinst_SCRIPTS = pre-inst-env
GOBJECTS = $(SOURCES:%.scm=%.go)
@@ -15,8 +8,7 @@ moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
ccachedir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
-nobase_dist_mod_DATA = $(filter-out $(BUILT_SOURCES),$(SOURCES)) $(NOCOMP_SOURCES)
-nobase_nodist_mod_DATA = $(BUILT_SOURCES)
+nobase_dist_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
nobase_go_DATA = $(GOBJECTS)
# Make sure source files are installed first, so that the mtime of
diff --git a/README.md b/README.md
index 4f8d65b..2fb9e2c 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,22 @@
# Table of Contents
-1. [Overview](#org4065207)
-2. [F.A.Q](#orgd8b8465)
-3. [Requirements](#orgae22de7)
-4. [Installation](#org5f335d1)
-5. [Usage](#orgfbf9088)
+1. [Overview](#org574fc8c)
+2. [F.A.Q](#org23f50e9)
+3. [Requirements](#orgb7bcbfe)
+4. [Installation](#org7c8eef8)
+5. [Usage](#org85647f0)
-
+
# Overview
MSG is an attempt to create a native-like experience for Guix on MacOS, using methods inspired by others like Podman/Docker/Lima. It uses Qemu with a prebuilt installer image to create a customized local Guix instance (supported on Intel and Apple Silicon based Macs). The base image is pretty barebones and is meant to be customized to your liking. To get a good idea of whats included you can reference the /etc/config.scm file within the built image.
-
+
# F.A.Q
@@ -31,7 +31,7 @@ MSG is an attempt to create a native-like experience for Guix on MacOS, using me
4. Introduce a MSG Desktop GUI to accompany the cli
-
+
# Requirements
@@ -44,10 +44,10 @@ MSG is an attempt to create a native-like experience for Guix on MacOS, using me
These can be installed by running:
- brew install autoconf automake libtool wget qemu texinfo
+ brew install autoconf automake libtool wget qemu texinfo guile-next
-
+
# Installation
@@ -60,15 +60,19 @@ These can be installed by running:
autoreconf -vif && ./configure && make && sudo make install
-3. Make sure to add the correct env vars set for guile/MSG (may need to adjust if using the guile homebrew tap)
+3. Make sure to add the correct env vars set for guile-next/msg.
- export GUILE_LOAD_PATH=/usr/local/share/guile/site/3.0/
- export GUILE_LOAD_COMPILED_PATH=/usr/local/lib/guile/3.0/site-ccache/
- export GUILE_SYSTEM_EXTENSIONS_PATH=/usr/local/lib/guile/3.0/extensions
+ export GUILE_LOAD_PATH=/opt/homebrew/share/guile/site/3.0
+ export GUILE_LOAD_COMPILED_PATH=/opt/homebrew/lib/guile/3.0/site-ccache
+ export GUILE_SYSTEM_EXTENSIONS_PATH=/opt/homebrew/lib/guile/3.0/extensions
+
+ export GUILE_LOAD_PATH=$GUILE_LOAD_PATH:/usr/local/share/guile/site/3.0/
+ export GUILE_LOAD_COMPILED_PATH=$GUILE_LOAD_COMPILED_PATH:/usr/local/lib/guile/3.0/site-ccache/
+ export GUILE_SYSTEM_EXTENSIONS_PATH=$GUILE_SYSTEM_EXTENSIONS_PATH:/usr/local/lib/guile/3.0/extensions
export PATH=/usr/local/bin:$PATH
-
+
# Usage
diff --git a/README.org b/README.org
index 8051901..5242681 100644
--- a/README.org
+++ b/README.org
@@ -27,7 +27,7 @@ MSG is an attempt to create a native-like experience for Guix on MacOS, using me
These can be installed by running:
#+begin_src sh
-brew install autoconf automake libtool wget qemu texinfo
+brew install autoconf automake libtool wget qemu texinfo guile-next
#+end_src
* Installation
@@ -42,11 +42,15 @@ brew install autoconf automake libtool wget qemu texinfo
autoreconf -vif && ./configure && make && sudo make install
#+end_src
-3. Make sure to add the correct env vars set for guile/MSG (may need to adjust if using the guile homebrew tap)
+3. Make sure to add the correct env vars set for guile-next/msg.
#+begin_src sh
- export GUILE_LOAD_PATH=/usr/local/share/guile/site/3.0/
- export GUILE_LOAD_COMPILED_PATH=/usr/local/lib/guile/3.0/site-ccache/
- export GUILE_SYSTEM_EXTENSIONS_PATH=/usr/local/lib/guile/3.0/extensions
+ export GUILE_LOAD_PATH=/opt/homebrew/share/guile/site/3.0
+ export GUILE_LOAD_COMPILED_PATH=/opt/homebrew/lib/guile/3.0/site-ccache
+ export GUILE_SYSTEM_EXTENSIONS_PATH=/opt/homebrew/lib/guile/3.0/extensions
+
+ export GUILE_LOAD_PATH=$GUILE_LOAD_PATH:/usr/local/share/guile/site/3.0/
+ export GUILE_LOAD_COMPILED_PATH=$GUILE_LOAD_COMPILED_PATH:/usr/local/lib/guile/3.0/site-ccache/
+ export GUILE_SYSTEM_EXTENSIONS_PATH=$GUILE_SYSTEM_EXTENSIONS_PATH:/usr/local/lib/guile/3.0/extensions
export PATH=/usr/local/bin:$PATH
#+end_src