some reorg fixes

Author: flammie

test/src/morphology/generate-propernoun-lemmas.sh.in

@@ -23,8 +23,8 @@
 POS=propernouns
 ### in ###
 source_file=${srcdir}/../../../src/fst/morphology/stems/${POS}.lexc
-generator_file=./../../../src/fst/generator-gt-norm
-analyser_file=./../../../src/fst/analyser-gt-norm
+generator_file=./../../../src/fst/morphology/generator-gt-norm
+analyser_file=./../../../src/fst/morphology/analyser-gt-norm
 
 ### out ###
 # Temporary files:

test/src/morphology/tag_test.sh

@@ -21,15 +21,15 @@ fi
 
 # Extract USED tags:
 sed -e '1,/LEXICON Root/d' < \
-    ../../../src/fst/lexicon.tmp.lexc | # Extract all lines after LEXICON Root
+    ../../../src/fst/morphology/lexicon.tmp.lexc | # Extract all lines after LEXICON Root
     ${giella_core}/scripts/extract-used-tags.sh | # Extract tags, local mods after this line:
     grep -v -E '(\+Enter|\+F[1-9])' | # Remove tag like entries found only in EST
     LC_ALL=no_NO.UTF8 sort -u         \
     > "${lexctags}"
 
 # Extract DEFINED tags:
 sed -n '/LEXICON Root/q;p' \
-    ../../../src/fst/lexicon.tmp.lexc | # Extract all lines before LEXICON Root
+    ../../../src/fst/morphology/lexicon.tmp.lexc | # Extract all lines before LEXICON Root
     ${giella_core}/scripts/extract-defined-tags.sh | # Extract tags, local mods after this line:
     LC_ALL=no_NO.UTF8 sort -u         \
     > "${roottags}"