Browse Source

Fix @prefix@ substitution

master
Peter J. Jones 4 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)
17 17
 $(PREFIX)/$(2): $(1)
18 18
 	@ echo "==> $$@"
19 19
 	@ mkdir -p `dirname $$@`
20
-	@ sed "s|@prefix@|$(PREFIX)|g" < $$< > $$@
20
+	@ sed "s|@prefix@|$(PREFIX)/$(DOT)|g" < $$< > $$@
21 21
 endef
22 22
 
23 23
 ################################################################################

+ 2
- 2
dot/zshenv View File

@@ -7,7 +7,7 @@ typeset -U path
7 7
 path=(~/bin $path)
8 8
 
9 9
 # Load core environment variables.
10
-source @prefix@/.zsh/lib/editor.zsh
10
+source @prefix@zsh/lib/editor.zsh
11 11
 
12 12
 # Other environment variables:
13 13
 export VIRSH_DEFAULT_CONNECT_URI="qemu:///system"
@@ -15,4 +15,4 @@ export GPG_TTY=$(tty)
15 15
 export OS=$(uname -s | tr '[A-Z]' '[a-z]')
16 16
 
17 17
 # Load in optional operating system override
18
-[ -r "@prefix@/.zsh/os/$OS" ] && source "@prefix@/.zsh/os/$OS"
18
+[ -r "@prefix@zsh/os/$OS" ] && source "@prefix@zsh/os/$OS"

+ 10
- 10
dot/zshrc View File

@@ -10,8 +10,8 @@ export LESS="-SRiJMW"
10 10
 export PAGER=less
11 11
 
12 12
 # add our function path
13
-functions_directory=@prefix@/.zsh/func
14
-widgets_directory=@prefix@/.zsh/wids
13
+functions_directory=@prefix@zsh/func
14
+widgets_directory=@prefix@zsh/wids
15 15
 fpath=($functions_directory $widgets_directory $fpath)
16 16
 
17 17
 # clober stuff
@@ -43,11 +43,11 @@ autoload -U ${fpath[1]}/*(:t)
43 43
 zmodload zsh/datetime
44 44
 
45 45
 # bring in other files
46
-source @prefix@/.zsh/lib/bindings.zsh
47
-source @prefix@/.zsh/lib/aliases.zsh
48
-source @prefix@/.zsh/lib/hosts.zsh
49
-source @prefix@/.zsh/lib/completion.zsh
50
-source @prefix@/.zsh/lib/directories.zsh
51
-source @prefix@/.zsh/lib/history.zsh
52
-source @prefix@/.zsh/lib/syntax.zsh
53
-source @prefix@/.zsh/lib/prompt.zsh
46
+source @prefix@zsh/lib/bindings.zsh
47
+source @prefix@zsh/lib/aliases.zsh
48
+source @prefix@zsh/lib/hosts.zsh
49
+source @prefix@zsh/lib/completion.zsh
50
+source @prefix@zsh/lib/directories.zsh
51
+source @prefix@zsh/lib/history.zsh
52
+source @prefix@zsh/lib/syntax.zsh
53
+source @prefix@zsh/lib/prompt.zsh

Loading…
Cancel
Save