diff --git a/share/fish.in b/share/fish.in
index ec4793228..0cc0ac503 100644
--- a/share/fish.in
+++ b/share/fish.in
@@ -5,6 +5,12 @@
 #
 # @configure_input@
 
+# Assign a temporary value here for performance reasons. The real
+# value should be set in /etc/fish.
+
+set -g fish_function_path @datadir@/fish/functions/
+set __fish_help_dir @docdir@
+
 # This is a Solaris-specific test to modify the PATH so that
 # Posix-conformant tools are used by default.
 
@@ -14,12 +20,6 @@ if test -d /usr/xpg4/bin
 	end
 end   
 
-# Assign a temporary value here for performance reasons. The real
-# value should be set in /etc/fish.
-
-set -g fish_function_path @datadir@/fish/functions/
-set __fish_help_dir @docdir@
-
 
 #
 # Make sure there are no invalid entries in the PATH