Browse Source

Fix @prefix@ substitution

master
Peter J. Jones 6 months ago
parent
commit
1f4f8f599a
Signed by: Peter Jones <pjones@devalot.com> GPG Key ID: 9DAFAA8D01941E49
3 changed files with 13 additions and 13 deletions
  1. 1
    1
      GNUmakefile
  2. 2
    2
      dot/zshenv
  3. 10
    10
      dot/zshrc

+ 1
- 1
GNUmakefile View File

@@ -17,7 +17,7 @@ install: $(PREFIX)/$(2)
$(PREFIX)/$(2): $(1)
@ echo "==> $$@"
@ mkdir -p `dirname $$@`
@ sed "s|@prefix@|$(PREFIX)|g" < $$< > $$@
@ sed "s|@prefix@|$(PREFIX)/$(DOT)|g" < $$< > $$@
endef

################################################################################

+ 2
- 2
dot/zshenv View File

@@ -7,7 +7,7 @@ typeset -U path
path=(~/bin $path)

# Load core environment variables.
source @prefix@/.zsh/lib/editor.zsh
source @prefix@zsh/lib/editor.zsh

# Other environment variables:
export VIRSH_DEFAULT_CONNECT_URI="qemu:///system"
@@ -15,4 +15,4 @@ export GPG_TTY=$(tty)
export OS=$(uname -s | tr '[A-Z]' '[a-z]')

# Load in optional operating system override
[ -r "@prefix@/.zsh/os/$OS" ] && source "@prefix@/.zsh/os/$OS"
[ -r "@prefix@zsh/os/$OS" ] && source "@prefix@zsh/os/$OS"

+ 10
- 10
dot/zshrc View File

@@ -10,8 +10,8 @@ export LESS="-SRiJMW"
export PAGER=less

# add our function path
functions_directory=@prefix@/.zsh/func
widgets_directory=@prefix@/.zsh/wids
functions_directory=@prefix@zsh/func
widgets_directory=@prefix@zsh/wids
fpath=($functions_directory $widgets_directory $fpath)

# clober stuff
@@ -43,11 +43,11 @@ autoload -U ${fpath[1]}/*(:t)
zmodload zsh/datetime

# bring in other files
source @prefix@/.zsh/lib/bindings.zsh
source @prefix@/.zsh/lib/aliases.zsh
source @prefix@/.zsh/lib/hosts.zsh
source @prefix@/.zsh/lib/completion.zsh
source @prefix@/.zsh/lib/directories.zsh
source @prefix@/.zsh/lib/history.zsh
source @prefix@/.zsh/lib/syntax.zsh
source @prefix@/.zsh/lib/prompt.zsh
source @prefix@zsh/lib/bindings.zsh
source @prefix@zsh/lib/aliases.zsh
source @prefix@zsh/lib/hosts.zsh
source @prefix@zsh/lib/completion.zsh
source @prefix@zsh/lib/directories.zsh
source @prefix@zsh/lib/history.zsh
source @prefix@zsh/lib/syntax.zsh
source @prefix@zsh/lib/prompt.zsh

Loading…
Cancel
Save