From 4b30d5db0623125d72fbca79752fcdb47e7063e3 Mon Sep 17 00:00:00 2001
From: pascal <pascal>
Date: Thu, 22 Jan 2009 14:06:43 +0000
Subject: [PATCH] =?UTF-8?q?Fehler=20(=E2=86=92Umbenennung)=20fehlende=20Da?=
 =?UTF-8?q?teien=20bei=20remove=20und=20Makefile=20erg=C3=A4nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 linux/Makefile                                    | 2 +-
 linux/bin/installiere_neo/erzeuge.installiere_neo | 2 +-
 linux/bin/installiere_neo/installiere_neo.1       | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/linux/Makefile b/linux/Makefile
index 86d7b555..7271f78e 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -2,7 +2,7 @@ FILES=bin/installiere_neo/installiere_neo xmodmap/neo_de_x-prog.xmodmap xmodmap/
 
 all:${FILES}
 
-bin/installiere_neo/installiere_neo: xmodmap/neo_de.xmodmap console/neo.map bin/asdf bin/uiae ../A-REFERENZ-A/neo20.txt bin/neo bin/num bin/wiemitneo bin/beschreibe ../Compose/Compose.neo etc/neo.conf bin/installiere_neo/erzeuge.installiere_neo bin/installiere_neo/installiere_neo.1 bin/installiere_neo/installiere_neo.2 
+bin/installiere_neo/installiere_neo: xmodmap/neo_de.xmodmap xmodmap/neo_de_alternative.xmodmap xmodmap/neo_de_x-prog.xmodmap console/neo.map bin/asdf bin/uiae ../A-REFERENZ-A/neo20.txt bin/neo bin/num bin/wiemitneo bin/beschreibe ../Compose/Compose.neo etc/neo.conf bin/installiere_neo/erzeuge.installiere_neo bin/installiere_neo/installiere_neo.1 bin/installiere_neo/installiere_neo.2 
 	cd bin/installiere_neo; ./erzeuge.installiere_neo > installiere_neo
 	chmod a+x $@
 
diff --git a/linux/bin/installiere_neo/erzeuge.installiere_neo b/linux/bin/installiere_neo/erzeuge.installiere_neo
index 5706ef5d..3950fb9e 100755
--- a/linux/bin/installiere_neo/erzeuge.installiere_neo
+++ b/linux/bin/installiere_neo/erzeuge.installiere_neo
@@ -37,7 +37,7 @@ rm -f ./erzeuge_installiere_neo.bak
 cat installiere_neo.1
 echo 
 
-fuege_ein neo_xmodmap ../../xmodmap/neo_de.xmodmap
+fuege_ein neo_standard_xmodmap ../../xmodmap/neo_de.xmodmap
 fuege_ein neo_alternative ../../xmodmap/neo_de_alternative.xmodmap
 fuege_ein neo_xprog ../../xmodmap/neo_de_x-prog.xmodmap
 fuege_ein neo_console ../../console/neo.map
diff --git a/linux/bin/installiere_neo/installiere_neo.1 b/linux/bin/installiere_neo/installiere_neo.1
index 36a33d14..8295236a 100644
--- a/linux/bin/installiere_neo/installiere_neo.1
+++ b/linux/bin/installiere_neo/installiere_neo.1
@@ -226,6 +226,8 @@ deinstall()
 	remove $inst_dir/uiae
 	remove $inst_dir/asdf
 	remove $inst_dir/neo.map
+	remove $inst_dir/neo_de_alternative.xmodmap
+	remove $inst_dir/neo_de_x-prog.xmodmap
 	remove $inst_dir/neo_de.xmodmap
 	echo "Entferne $inst_dir/"
 	rmdir $inst_dir/ || echo -e "${red}Konnte das Verzeichenis $inst_dir/ nicht entfernen!${normal}"