auf Anraten eines der „großen Alten“ das Template neo.conf entsprechend ›installiere_neo‹ angepasst – „warst du halt der erste ;--)“

git-svn-id: https://svn.neo-layout.org@1384 b9310e46-f624-0410-8ea1-cfbb3a30dc96

4 files changed, 4 insertions, 62 deletions

diff --git a/linux/bin/installiere_neo/Makefile b/linux/bin/installiere_neo/Makefile
index 5af1bcd..0ed2880 100644
--- a/linux/bin/installiere_neo/Makefile
+++ b/linux/bin/installiere_neo/Makefile
@@ -1,4 +1,4 @@
-installiere_neo: ../../xmodmap/neo_de.xmodmap ../../console/neo.map ../asdf ../uiae ../../../A-REFERENZ-A/neo20.txt ../neo ../num ../../../Compose/Compose.neo neo.conf.erzeuge.installiere_neo 
+installiere_neo: ../../xmodmap/neo_de.xmodmap ../../console/neo.map ../asdf ../uiae ../../../A-REFERENZ-A/neo20.txt ../neo ../num ../../../Compose/Compose.neo ../../etc/neo.conf 
 	./erzeuge.installiere_neo > installiere_neo
 	chmod a+x installiere_neo
 
diff --git a/linux/bin/installiere_neo/erzeuge.installiere_neo b/linux/bin/installiere_neo/erzeuge.installiere_neo
index 8b2986d..83b9a95 100755
--- a/linux/bin/installiere_neo/erzeuge.installiere_neo
+++ b/linux/bin/installiere_neo/erzeuge.installiere_neo
@@ -46,6 +46,6 @@ fuege_ein neo_referenz ../../../A-REFERENZ-A/neo20.txt
 fuege_ein neo_neo ../neo
 fuege_ein neo_num ../num
 fuege_ein neo_compose ../../../Compose/Compose.neo
-fuege_ein neorc neo.conf.erzeuge.installiere_neo
+fuege_ein neorc ../../etc/neo.conf
 
 cat installiere_neo.2
\ No newline at end of file
diff --git a/linux/bin/installiere_neo/neo.conf.erzeuge.installiere_neo b/linux/bin/installiere_neo/neo.conf.erzeuge.installiere_neo
deleted file mode 100644
index 292212a..0000000
--- a/linux/bin/installiere_neo/neo.conf.erzeuge.installiere_neo
+++ /dev/null
@@ -1,58 +0,0 @@
-# This file contains the configuration for the Neo scripts
-
-# To use the scripts ›neo‹ and ›num‹ you should specify the full path to the
-# Neo reference
-NEO_REFERENCE="$HOME/neo/neo20.txt"
-
-
-# Select the neo Variant to be used when using an X Server
-# Values are "xkbmap", "xmodmap", "xprog", "alternative" or "evdev"
-# default is xkbmap, this variable should always be set
-NEO_X_VARIANTE="xmodmap"
-
-
-# When using xkbmap, you may specify which xkbmap should be used, the default
-# is "de" (This is useful if you installed the symbols file under a different 
-# name):
-#NEO_XKBMAP=de
-
-# You can also specify the xkbmap variant to be used, the default is "neo":
-#NEO_XKBVARIANT=neo
-
-
-# When using a xmodmap, you may specify the full path to the xmodmap to be used.
-# Default:
-NEO_XMODMAP="$HOME/neo/neo_de.xmodmap"
-#NEO_XMODMAP_XPROG="$HOME/neo/neo_de_x-prog.xmodmap"
-#NEO_XMODMAP_ALTERNATIVE="$HOME/neo/neo_de_alternative.xmodmap"
-#NEO_XMODMAP_EVDEV="$HOME/neo/neo_de_evdev.xmodmap"
-
-
-# Standard keyboard layout to switch back to when executing "uiae":
-#STD_XKBMAP=de
-
-# Standard layout variant to switch back to when executing "uiae":
-#STD_XKBVARIANT=nodeadkeys
-
-# Numlock status when switching to standard keyboard layout using "uiae",
-# values are "on" and "off":
-#NUM_LOCK_STATUS=on
-
-
-# For Neo without an X System set the path to the console keymap
-NEO_CONSOLE_KEYMAP="$HOME/neo/neo" # if necessary add „.map“
-
-# Set the standard console keymap to switch back to
-#STD_CONSOLE_KEYMAP="de-latin1-nodeadkeys"
-
-
-# If you installed one of these programs in a non-standard path you may,
-# uncomment the variable and change the path to the executable:
-#PATH_XMODMAP=/usr/bin/xmodmap
-#PATH_SETXKBMAP=/usr/bin/setxkbmap
-#PATH_LOADKEYS=/usr/bin/loadkeys
-#PATH_SUDO=/usr/bin/sudo
-#PATH_SETLEDS=/usr/bin/setleds
-#PATH_NUMLOCKX=/usr/bin/numlockx
-#PATH_XSET=/usr/bin/xset
-
diff --git a/linux/etc/neo.conf b/linux/etc/neo.conf
index 4ec33c7..7335e4e 100644
--- a/linux/etc/neo.conf
+++ b/linux/etc/neo.conf
@@ -8,7 +8,7 @@ NEO_REFERENCE="$HOME/neo/neo20.txt"
 # Select the neo Variant to be used when using an X Server
 # Values are "xkbmap", "xmodmap", "xprog", "alternative" or "evdev"
 # default is xkbmap, this variable should always be set
-NEO_X_VARIANTE="xkbmap"
+NEO_X_VARIANTE="xmodmap"
 
 
 # When using xkbmap, you may specify which xkbmap should be used, the default
@@ -40,7 +40,7 @@ NEO_X_VARIANTE="xkbmap"
 
 
 # For Neo without an X System set the path to the console keymap
-#NEO_CONSOLE_KEYMAP="$HOME/neo/neo" # for $HOME/neo/neo.map (without the „.map“)
+#NEO_CONSOLE_KEYMAP="$HOME/neo/neo" # if necessary add „.map“
 
 # Set the standard console keymap to switch back to
 #STD_CONSOLE_KEYMAP="de-latin1-nodeadkeys"