summaryrefslogtreecommitdiffstats
path: root/linux
diff options
context:
space:
mode:
authorhans-christoph <hans-christoph@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-07-15 09:44:44 +0000
committerhans-christoph <hans-christoph@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2009-07-15 09:44:44 +0000
commit8a22a88027680006a621c7b5f03e5ddd3dd0cac7 (patch)
treea356d73593c1e80b29e301211604d58fe8263773 /linux
parentbfaac541698db646960f758a50815bcf1de4f4cb (diff)
fix für #150: erzeuge.installiere_neo geht nicht mehr seit r1928
git-svn-id: https://svn.neo-layout.org@1930 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to '')
-rw-r--r--linux/Makefile5
-rwxr-xr-xlinux/bin/installiere_neo/erzeuge.installiere_neo2
2 files changed, 5 insertions, 2 deletions
diff --git a/linux/Makefile b/linux/Makefile
index 0a87c6f..eba053a 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -3,10 +3,13 @@ xmodmap/neo_de_alternative.xmodmap xmodmap/neo_de.xmodmap.referenz X/xkb.tgz
all:${FILES}
-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
+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/XCompose 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 $@
+../Compose/XCompose :
+ cd ../Compose ; make XCompose
+
xmodmap/neo_de_x-prog.xmodmap:xmodmap/neo_de.xmodmap
sed -e 's/\x09Up/\x9KP_Up/g' \
-e 's/BackSpace/NoSymbol/g' \
diff --git a/linux/bin/installiere_neo/erzeuge.installiere_neo b/linux/bin/installiere_neo/erzeuge.installiere_neo
index cbbb2dc..8c6a043 100755
--- a/linux/bin/installiere_neo/erzeuge.installiere_neo
+++ b/linux/bin/installiere_neo/erzeuge.installiere_neo
@@ -48,7 +48,7 @@ fuege_ein neo_neo ../neo
fuege_ein neo_num ../num
fuege_ein neo_wiemitneo ../wiemitneo
fuege_ein neo_beschreibe ../beschreibe
-fuege_ein neo_compose ../../../Compose/Compose.neo
+fuege_ein neo_compose ../../../Compose/XCompose
fuege_ein neorc ../../etc/neo.conf
cat installiere_neo.2