summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-01-22 14:06:43 +0000
committerpascal <pascal@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-01-22 14:06:43 +0000
commit6b194bc4390782cf41b93bf1499aa9e47b4e6d05 (patch)
tree631094b822c7e6045504f70679ede8f46d8824a8
parented65a9dcc09fee263857bc294034aac05e0b4159 (diff)
downloadneo-layout-6b194bc4390782cf41b93bf1499aa9e47b4e6d05.tar.gz
neo-layout-6b194bc4390782cf41b93bf1499aa9e47b4e6d05.tar.bz2
neo-layout-6b194bc4390782cf41b93bf1499aa9e47b4e6d05.zip
Fehler (→Umbenennung)
fehlende Dateien bei remove und Makefile ergänzt git-svn-id: https://svn.neo-layout.org@1508 b9310e46-f624-0410-8ea1-cfbb3a30dc96
-rw-r--r--linux/Makefile2
-rwxr-xr-xlinux/bin/installiere_neo/erzeuge.installiere_neo2
-rw-r--r--linux/bin/installiere_neo/installiere_neo.12
3 files changed, 4 insertions, 2 deletions
diff --git a/linux/Makefile b/linux/Makefile
index 86d7b55..7271f78 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 5706ef5..3950fb9 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 36a33d1..8295236 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}"