diff options
| author | hans-christoph <hans-christoph@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2009-07-15 09:44:44 +0000 |
|---|---|---|
| committer | hans-christoph <hans-christoph@b9310e46-f624-0410-8ea1-cfbb3a30dc96> | 2009-07-15 09:44:44 +0000 |
| commit | 8a22a88027680006a621c7b5f03e5ddd3dd0cac7 (patch) | |
| tree | a356d73593c1e80b29e301211604d58fe8263773 | |
| parent | bfaac541698db646960f758a50815bcf1de4f4cb (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
| -rw-r--r-- | Compose/Makefile | 6 | ||||
| -rw-r--r-- | linux/Makefile | 5 | ||||
| -rwxr-xr-x | linux/bin/installiere_neo/erzeuge.installiere_neo | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Compose/Makefile b/Compose/Makefile index 2fe7a00..364964f 100644 --- a/Compose/Makefile +++ b/Compose/Makefile @@ -9,7 +9,8 @@ DEFAULTS = \ base_greek_lang \ base_roman -MODULES = $(notdir $(basename $(wildcard $(SRC)/*.module))) +MODULES_SRC = $(wildcard $(SRC)/*.module)) +MODULES = $(notdir $(basename $(MODULES_SRC))) CHECKCOMPOSE = ./check-compose.pl @@ -38,6 +39,9 @@ XCompose%: FORCE fi \ done +XCompose : XCompose_base + cp $< $@ + check : @for i in XCompose*; do \ $(CHECKCOMPOSE) -q $$i || (\ 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 |