[fcm] 01/01: upstream release 2017.09.0

Alastair McKinstry mckinstry at moszumanska.debian.org
Sun Oct 1 17:07:43 UTC 2017


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag upstream/2017.09.0
in repository fcm.

commit 5e783b28ca2ae041172e590ddd4e8bad70385dcd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Oct 1 18:07:19 2017 +0100

    upstream release 2017.09.0
---
 .gitignore                                         |   2 +
 doc/etc/fcm-version.js                             |   1 -
 ACKNOWLEDGEMENT.md => usr/ACKNOWLEDGEMENT.md       |   0
 CHANGES.md => usr/CHANGES.md                       |  17 +++++
 CONTRIBUTING.md => usr/CONTRIBUTING.md             |   0
 COPYING => usr/COPYING                             |   0
 README.md => usr/README.md                         |   0
 .../doc}/collaboration/feeding-back-patch.png      | Bin
 {doc => usr/doc}/collaboration/index.html          |   0
 .../doc}/collaboration/managing-local-changes.png  | Bin
 .../doc}/collaboration/merging-patch-multi.png     | Bin
 .../doc}/collaboration/merging-patch-one.png       | Bin
 {doc => usr/doc}/collaboration/mirroring-trunk.png | Bin
 {doc => usr/doc}/collaboration/updating-branch.png | Bin
 .../doc}/collaboration/updating-shared-branch.png  | Bin
 .../doc}/collaboration/working-as-collaborator.png | Bin
 .../doc}/etc/bootstrap/css/bootstrap-theme.css     |   0
 .../doc}/etc/bootstrap/css/bootstrap-theme.css.map |   0
 .../doc}/etc/bootstrap/css/bootstrap-theme.min.css |   0
 .../etc/bootstrap/css/bootstrap-theme.min.css.map  |   0
 {doc => usr/doc}/etc/bootstrap/css/bootstrap.css   |   0
 .../doc}/etc/bootstrap/css/bootstrap.css.map       |   0
 .../doc}/etc/bootstrap/css/bootstrap.min.css       |   0
 .../doc}/etc/bootstrap/css/bootstrap.min.css.map   |   0
 .../fonts/glyphicons-halflings-regular.eot         | Bin
 .../fonts/glyphicons-halflings-regular.svg         |   0
 .../fonts/glyphicons-halflings-regular.ttf         | Bin
 .../fonts/glyphicons-halflings-regular.woff        | Bin
 .../fonts/glyphicons-halflings-regular.woff2       | Bin
 {doc => usr/doc}/etc/bootstrap/js/bootstrap.js     |   0
 {doc => usr/doc}/etc/bootstrap/js/bootstrap.min.js |   0
 {doc => usr/doc}/etc/bootstrap/js/npm.js           |   0
 {doc => usr/doc}/etc/fcm-icon.png                  | Bin
 {doc => usr/doc}/etc/fcm-terms-of-use.html         |   0
 usr/doc/etc/fcm-version.js                         |   1 +
 {doc => usr/doc}/etc/fcm.css                       |   0
 {doc => usr/doc}/etc/fcm.js                        |   0
 {doc => usr/doc}/etc/fcm.png                       | Bin
 {doc => usr/doc}/etc/jquery.min.js                 |   0
 {doc => usr/doc}/etc/moment.min.js                 |   0
 {doc => usr/doc}/index.html                        |   0
 {doc => usr/doc}/installation/index.html           |   0
 {doc => usr/doc}/release_notes/1-1.html            |   0
 {doc => usr/doc}/release_notes/1-2.html            |   0
 {doc => usr/doc}/release_notes/1-3.html            |   0
 {doc => usr/doc}/release_notes/1-4.html            |   0
 {doc => usr/doc}/release_notes/1-5.html            |   0
 {doc => usr/doc}/release_notes/2-0.html            |   0
 {doc => usr/doc}/release_notes/2-1.html            |   0
 {doc => usr/doc}/release_notes/2-2.html            |   0
 {doc => usr/doc}/release_notes/2-3-1.html          |   0
 {doc => usr/doc}/release_notes/2-3.html            |   0
 {doc => usr/doc}/release_notes/index.html          |   0
 {doc => usr/doc}/user_guide/annex_bld_cfg.html     |   0
 {doc => usr/doc}/user_guide/annex_cfg.html         |  21 ++++--
 {doc => usr/doc}/user_guide/annex_ext_cfg.html     |   0
 {doc => usr/doc}/user_guide/annex_fcm_cfg.html     |   0
 {doc => usr/doc}/user_guide/annex_quick_ref.html   |   0
 .../user_guide/annex_quick_ref_tree_conflicts.html |   0
 {doc => usr/doc}/user_guide/api.html               |   0
 {doc => usr/doc}/user_guide/build.html             |   0
 {doc => usr/doc}/user_guide/changeset.png          | Bin
 {doc => usr/doc}/user_guide/code_management.html   |   0
 {doc => usr/doc}/user_guide/command_ref.html       |   0
 {doc => usr/doc}/user_guide/create_branch.png      | Bin
 {doc => usr/doc}/user_guide/extract.html           |   0
 {doc => usr/doc}/user_guide/fcm_overview.png       | Bin
 {doc => usr/doc}/user_guide/getting_started.html   |   0
 {doc => usr/doc}/user_guide/gui1.png               | Bin
 {doc => usr/doc}/user_guide/gui2.png               | Bin
 {doc => usr/doc}/user_guide/index.html             |   0
 {doc => usr/doc}/user_guide/introduction.html      |   0
 {doc => usr/doc}/user_guide/make.html              |   0
 {doc => usr/doc}/user_guide/overview.html          |   0
 {doc => usr/doc}/user_guide/system_admin.html      |   0
 {doc => usr/doc}/user_guide/working_practices.html |   0
 {doc => usr/doc}/user_guide/xxdiff1.png            | Bin
 {doc => usr/doc}/user_guide/xxdiff2.png            | Bin
 {doc => usr/doc}/user_guide/xxdiff_tutorial.png    | Bin
 {etc => usr/etc}/fcm/admin.cfg.example             |   0
 {etc => usr/etc}/fcm/external.cfg.example          |   0
 {etc => usr/etc}/fcm/keyword.cfg.example           |   0
 {etc => usr/etc}/fcm/make.cfg.example              |   0
 {etc => usr/etc}/svn-hooks/post-commit             |   0
 {etc => usr/etc}/svn-hooks/post-revprop-change     |   0
 {etc => usr/etc}/svn-hooks/pre-commit              |   0
 {etc => usr/etc}/svn-hooks/pre-revprop-change      |   0
 index.html => usr/index.html                       |   0
 {lib => usr/lib}/FCM/Admin/Config.pm               |   0
 {lib => usr/lib}/FCM/Admin/Project.pm              |   0
 {lib => usr/lib}/FCM/Admin/Runner.pm               |   0
 {lib => usr/lib}/FCM/Admin/System.pm               |   0
 {lib => usr/lib}/FCM/Admin/User.pm                 |   0
 {lib => usr/lib}/FCM/Admin/Users/LDAP.pm           |   0
 {lib => usr/lib}/FCM/Admin/Users/Passwd.pm         |   0
 {lib => usr/lib}/FCM/Admin/Util.pm                 |   0
 {lib => usr/lib}/FCM/CLI.pm                        |   0
 {lib => usr/lib}/FCM/CLI/Exception.pm              |   0
 {lib => usr/lib}/FCM/CLI/Parser.pm                 |   0
 {lib => usr/lib}/FCM/CLI/fcm-add.pod               |   0
 {lib => usr/lib}/FCM/CLI/fcm-branch-create.pod     |   0
 {lib => usr/lib}/FCM/CLI/fcm-branch-delete.pod     |   0
 {lib => usr/lib}/FCM/CLI/fcm-branch-diff.pod       |   0
 {lib => usr/lib}/FCM/CLI/fcm-branch-info.pod       |   0
 {lib => usr/lib}/FCM/CLI/fcm-branch-list.pod       |   0
 {lib => usr/lib}/FCM/CLI/fcm-branch.pod            |   0
 {lib => usr/lib}/FCM/CLI/fcm-browse.pod            |   0
 {lib => usr/lib}/FCM/CLI/fcm-build.pod             |   0
 {lib => usr/lib}/FCM/CLI/fcm-cfg-print.pod         |   0
 {lib => usr/lib}/FCM/CLI/fcm-changelist.pod        |   0
 {lib => usr/lib}/FCM/CLI/fcm-cmp-ext-cfg.pod       |   0
 {lib => usr/lib}/FCM/CLI/fcm-commit.pod            |   0
 {lib => usr/lib}/FCM/CLI/fcm-conflicts.pod         |   0
 {lib => usr/lib}/FCM/CLI/fcm-delete.pod            |   0
 {lib => usr/lib}/FCM/CLI/fcm-diff.pod              |   0
 {lib => usr/lib}/FCM/CLI/fcm-export-items.pod      |   0
 {lib => usr/lib}/FCM/CLI/fcm-extract.pod           |   0
 {lib => usr/lib}/FCM/CLI/fcm-gui.pod               |   0
 {lib => usr/lib}/FCM/CLI/fcm-help.pod              |   0
 {lib => usr/lib}/FCM/CLI/fcm-keyword-print.pod     |   0
 {lib => usr/lib}/FCM/CLI/fcm-loc-layout.pod        |   0
 {lib => usr/lib}/FCM/CLI/fcm-make.pod              |   0
 {lib => usr/lib}/FCM/CLI/fcm-merge.pod             |   0
 {lib => usr/lib}/FCM/CLI/fcm-mkpatch.pod           |   0
 {lib => usr/lib}/FCM/CLI/fcm-project-create.pod    |   0
 {lib => usr/lib}/FCM/CLI/fcm-switch.pod            |   0
 {lib => usr/lib}/FCM/CLI/fcm-test-battery.pod      |   0
 {lib => usr/lib}/FCM/CLI/fcm-update.pod            |   0
 {lib => usr/lib}/FCM/CLI/fcm-version.pod           |   0
 {lib => usr/lib}/FCM/Class/CODE.pm                 |   0
 {lib => usr/lib}/FCM/Class/Exception.pm            |   0
 {lib => usr/lib}/FCM/Class/HASH.pm                 |   0
 {lib => usr/lib}/FCM/Context/ConfigEntry.pm        |   0
 {lib => usr/lib}/FCM/Context/Event.pm              |   0
 {lib => usr/lib}/FCM/Context/Keyword.pm            |   0
 {lib => usr/lib}/FCM/Context/Locator.pm            |   0
 {lib => usr/lib}/FCM/Context/Make.pm               |   5 ++
 {lib => usr/lib}/FCM/Context/Make/Build.pm         |   0
 {lib => usr/lib}/FCM/Context/Make/Extract.pm       |   0
 {lib => usr/lib}/FCM/Context/Make/Mirror.pm        |   0
 .../lib}/FCM/Context/Make/Share/Property.pm        |   0
 {lib => usr/lib}/FCM/Context/Task.pm               |   0
 {lib => usr/lib}/FCM/Exception.pm                  |   0
 {lib => usr/lib}/FCM/System.pm                     |   0
 {lib => usr/lib}/FCM/System/CM.pm                  |   0
 {lib => usr/lib}/FCM/System/CM/CommitMessage.pm    |   0
 {lib => usr/lib}/FCM/System/CM/Prompt.pm           |   0
 {lib => usr/lib}/FCM/System/CM/ResolveConflicts.pm |   0
 {lib => usr/lib}/FCM/System/CM/SVN.pm              |   0
 {lib => usr/lib}/FCM/System/Exception.pm           |   0
 {lib => usr/lib}/FCM/System/Make.pm                |   0
 {lib => usr/lib}/FCM/System/Make/Build.pm          |   0
 {lib => usr/lib}/FCM/System/Make/Build/FileType.pm |   0
 .../lib}/FCM/System/Make/Build/FileType/C.pm       |   0
 .../lib}/FCM/System/Make/Build/FileType/CPP.pm     |   0
 .../lib}/FCM/System/Make/Build/FileType/CXX.pm     |   0
 .../lib}/FCM/System/Make/Build/FileType/Data.pm    |   0
 .../lib}/FCM/System/Make/Build/FileType/FPP.pm     |   0
 .../lib}/FCM/System/Make/Build/FileType/Fortran.pm |   0
 .../lib}/FCM/System/Make/Build/FileType/H.pm       |   0
 .../lib}/FCM/System/Make/Build/FileType/NS.pm      |   0
 .../lib}/FCM/System/Make/Build/FileType/Script.pm  |   0
 .../lib}/FCM/System/Make/Build/Task/Archive.pm     |  10 +--
 .../lib}/FCM/System/Make/Build/Task/Compile.pm     |   0
 .../lib}/FCM/System/Make/Build/Task/Compile/C.pm   |   0
 .../lib}/FCM/System/Make/Build/Task/Compile/CXX.pm |   0
 .../FCM/System/Make/Build/Task/Compile/Fortran.pm  |   0
 .../FCM/System/Make/Build/Task/ExtractInterface.pm |   0
 .../lib}/FCM/System/Make/Build/Task/Install.pm     |   0
 .../lib}/FCM/System/Make/Build/Task/Link.pm        |  71 ++++++---------------
 .../lib}/FCM/System/Make/Build/Task/Link/C.pm      |   0
 .../lib}/FCM/System/Make/Build/Task/Link/CXX.pm    |   0
 .../FCM/System/Make/Build/Task/Link/Fortran.pm     |   0
 .../lib}/FCM/System/Make/Build/Task/Preprocess.pm  |   0
 .../FCM/System/Make/Build/Task/Preprocess/C.pm     |   0
 .../System/Make/Build/Task/Preprocess/Fortran.pm   |   0
 .../lib}/FCM/System/Make/Build/Task/Share.pm       |   0
 {lib => usr/lib}/FCM/System/Make/Extract.pm        |   0
 {lib => usr/lib}/FCM/System/Make/Mirror.pm         |   0
 {lib => usr/lib}/FCM/System/Make/Preprocess.pm     |   0
 {lib => usr/lib}/FCM/System/Make/Share/Config.pm   |  16 +++--
 {lib => usr/lib}/FCM/System/Make/Share/Dest.pm     |   0
 .../lib}/FCM/System/Make/Share/Subsystem.pm        |   0
 {lib => usr/lib}/FCM/System/Misc.pm                |   0
 {lib => usr/lib}/FCM/System/Old.pm                 |   0
 {lib => usr/lib}/FCM/Util.pm                       |   0
 {lib => usr/lib}/FCM/Util/ConfigReader.pm          |   0
 {lib => usr/lib}/FCM/Util/ConfigUpgrade.pm         |   0
 {lib => usr/lib}/FCM/Util/Event.pm                 |   4 ++
 {lib => usr/lib}/FCM/Util/Exception.pm             |   0
 {lib => usr/lib}/FCM/Util/Locator.pm               |   0
 {lib => usr/lib}/FCM/Util/Locator/FS.pm            |   0
 {lib => usr/lib}/FCM/Util/Locator/SSH.pm           |   0
 {lib => usr/lib}/FCM/Util/Locator/SVN.pm           |   0
 {lib => usr/lib}/FCM/Util/Reporter.pm              |   0
 {lib => usr/lib}/FCM/Util/Shell.pm                 |   0
 {lib => usr/lib}/FCM/Util/TaskRunner.pm            |   0
 {lib => usr/lib}/FCM1/Base.pm                      |   0
 {lib => usr/lib}/FCM1/Build.pm                     |   0
 {lib => usr/lib}/FCM1/Build/Fortran.pm             |   0
 {lib => usr/lib}/FCM1/BuildSrc.pm                  |   0
 {lib => usr/lib}/FCM1/BuildTask.pm                 |   0
 {lib => usr/lib}/FCM1/CfgFile.pm                   |   0
 {lib => usr/lib}/FCM1/CfgLine.pm                   |   0
 {lib => usr/lib}/FCM1/Cm.pm                        |   0
 {lib => usr/lib}/FCM1/CmBranch.pm                  |   0
 {lib => usr/lib}/FCM1/CmUrl.pm                     |   0
 {lib => usr/lib}/FCM1/Config.pm                    |   0
 {lib => usr/lib}/FCM1/ConfigSystem.pm              |   0
 {lib => usr/lib}/FCM1/Dest.pm                      |   0
 {lib => usr/lib}/FCM1/Exception.pm                 |   0
 {lib => usr/lib}/FCM1/Extract.pm                   |   0
 {lib => usr/lib}/FCM1/ExtractConfigComparator.pm   |   0
 {lib => usr/lib}/FCM1/ExtractFile.pm               |   0
 {lib => usr/lib}/FCM1/ExtractSrc.pm                |   0
 {lib => usr/lib}/FCM1/Interactive.pm               |   0
 {lib => usr/lib}/FCM1/Interactive/InputGetter.pm   |   0
 .../lib}/FCM1/Interactive/InputGetter/CLI.pm       |   0
 .../lib}/FCM1/Interactive/InputGetter/GUI.pm       |   0
 {lib => usr/lib}/FCM1/Keyword.pm                   |   0
 {lib => usr/lib}/FCM1/ReposBranch.pm               |   0
 {lib => usr/lib}/FCM1/SrcDirLayer.pm               |   0
 {lib => usr/lib}/FCM1/Timer.pm                     |   0
 {lib => usr/lib}/FCM1/Util.pm                      |   0
 {lib => usr/lib}/FCM1/Util/ClassLoader.pm          |   0
 {licences => usr/licences}/Apache2                 |   0
 {licences => usr/licences}/GPL3                    |   0
 {licences => usr/licences}/MIT                     |   0
 {man => usr/man}/man1/fcm.1                        |   0
 {sbin => usr/sbin}/fcm-add-svn-repos               |   0
 {sbin => usr/sbin}/fcm-add-svn-repos-and-trac-env  |   0
 {sbin => usr/sbin}/fcm-add-trac-env                |   0
 {sbin => usr/sbin}/fcm-backup-svn-repos            |   0
 {sbin => usr/sbin}/fcm-backup-trac-env             |   0
 {sbin => usr/sbin}/fcm-commit-update               |   0
 {sbin => usr/sbin}/fcm-daily-update                |   0
 {sbin => usr/sbin}/fcm-install-svn-hook            |   0
 {sbin => usr/sbin}/fcm-manage-trac-env-session     |   0
 {sbin => usr/sbin}/fcm-manage-users                |   0
 {sbin => usr/sbin}/fcm-recover-svn-repos           |   0
 {sbin => usr/sbin}/fcm-recover-trac-env            |   0
 {sbin => usr/sbin}/fcm-rpmbuild                    |   0
 {sbin => usr/sbin}/fcm-user-to-email               |   0
 {sbin => usr/sbin}/fcm-vacuum-trac-env-db          |   0
 {sbin => usr/sbin}/my-regular-update.example       |   0
 {sbin => usr/sbin}/post-commit-bg                  |   0
 {sbin => usr/sbin}/post-commit-bg-notify-who       |   0
 {sbin => usr/sbin}/post-revprop-change-bg          |   0
 {sbin => usr/sbin}/pre-commit                      |   0
 {sbin => usr/sbin}/pre-commit-verify-branch-owner  |   0
 {sbin => usr/sbin}/pre-revprop-change              |   0
 {sbin => usr/sbin}/svnperms.py                     |   0
 {sbin => usr/sbin}/trac_hook                       |   0
 .../t}/etc/repo_files/lib/python/info/__init__.py  |   0
 .../t}/etc/repo_files/lib/python/info/poems.py     |   0
 .../t}/etc/repo_files/module/hello_constants.f90   |   0
 .../t}/etc/repo_files/module/hello_constants.inc   |   0
 .../repo_files/module/hello_constants_dummy.inc    |   0
 {t => usr/t}/etc/repo_files/pro/hello.pro          |   0
 {t => usr/t}/etc/repo_files/pro/plot.pro           |   0
 {t => usr/t}/etc/repo_files/program/hello.F90      |   0
 {t => usr/t}/etc/repo_files/subroutine/hello_c.c   |   0
 .../t}/etc/repo_files/subroutine/hello_sub.F90     |   0
 {t => usr/t}/etc/repo_files/subroutine/hello_sub.h |   0
 .../t}/etc/repo_files/subroutine/hello_sub_dummy.h |   0
 {t => usr/t}/fcm-add-trac-env/00-basic.t           |   0
 {t => usr/t}/fcm-add-trac-env/test_header          |   0
 {t => usr/t}/fcm-add/00-simple.t                   |   0
 {t => usr/t}/fcm-add/test_header                   |   0
 {t => usr/t}/fcm-backup-svn-repos/00-basic.t       |   0
 {t => usr/t}/fcm-backup-svn-repos/test_header      |   0
 {t => usr/t}/fcm-branch-create/00-simple.t         |   0
 {t => usr/t}/fcm-branch-create/test_header         |   0
 {t => usr/t}/fcm-branch-delete/00-simple.t         |   0
 {t => usr/t}/fcm-branch-delete/01-bad-arg.t        |   0
 {t => usr/t}/fcm-branch-delete/02-rosie.t          |   0
 {t => usr/t}/fcm-branch-delete/test_header         |   0
 {t => usr/t}/fcm-branch-diff/00-simple.t           |   0
 {t => usr/t}/fcm-branch-diff/test_header           |   0
 {t => usr/t}/fcm-branch-info/00-simple.t           |   0
 {t => usr/t}/fcm-branch-info/test_header           |   0
 {t => usr/t}/fcm-branch-list/00-simple.t           |   0
 {t => usr/t}/fcm-branch-list/test_header           |   0
 {t => usr/t}/fcm-build/00-geninterface.t           |   0
 {t => usr/t}/fcm-build/test_header                 |   0
 {t => usr/t}/fcm-cfg-print/00-env.t                |   0
 {t => usr/t}/fcm-cfg-print/test_header             |   0
 {t => usr/t}/fcm-commit/00-simple.t                |   0
 {t => usr/t}/fcm-commit/01-subtree.t               |   0
 {t => usr/t}/fcm-commit/02-bad.t                   |   0
 {t => usr/t}/fcm-commit/03-message-file.t          |   0
 {t => usr/t}/fcm-commit/04-externals.t             |   0
 {t => usr/t}/fcm-commit/test_header                |   0
 {t => usr/t}/fcm-conflicts/00-tree-add-add.t       |   0
 {t => usr/t}/fcm-conflicts/01-tree-delete-delete.t |   0
 {t => usr/t}/fcm-conflicts/02-tree-delete-edit.t   |   0
 {t => usr/t}/fcm-conflicts/03-tree-delete-rename.t |   0
 {t => usr/t}/fcm-conflicts/04-tree-edit-delete.t   |   0
 {t => usr/t}/fcm-conflicts/05-tree-edit-rename.t   |   0
 {t => usr/t}/fcm-conflicts/06-tree-rename-delete.t |   0
 {t => usr/t}/fcm-conflicts/07-tree-rename-edit.t   |   0
 .../t}/fcm-conflicts/08-tree-rename-rename-diff.t  |   0
 .../t}/fcm-conflicts/09-tree-rename-rename-same.t  |   0
 {t => usr/t}/fcm-conflicts/10-text.t               |   0
 {t => usr/t}/fcm-conflicts/11-tree-edit-replace.t  |   0
 {t => usr/t}/fcm-conflicts/test_header             |   0
 {t => usr/t}/fcm-diff/00-simple.t                  |   0
 {t => usr/t}/fcm-diff/test_header                  |   0
 {t => usr/t}/fcm-install-svn-hook/00-basic.t       |   0
 .../t}/fcm-install-svn-hook/00-basic/clean-2.out   |   0
 .../t}/fcm-install-svn-hook/00-basic/clean.out     |   0
 .../00-basic/commit-conf-2.out                     |   0
 .../00-basic/commit-conf-site-override-2.out       |   0
 .../00-basic/commit-conf-site-override.out         |   0
 .../fcm-install-svn-hook/00-basic/commit-conf.out  |   0
 .../t}/fcm-install-svn-hook/00-basic/new-2.out     |   0
 {t => usr/t}/fcm-install-svn-hook/00-basic/new.out |   0
 .../00-basic/svnperms-conf-2.out                   |   0
 .../00-basic/svnperms-conf.out                     |   0
 .../t}/fcm-install-svn-hook/01-housekeep-log.t     |   0
 .../01-housekeep-log/0-cmd0.out                    |   0
 .../01-housekeep-log/0-cmd1.out                    |   0
 .../01-housekeep-log/28-cmd.out                    |   0
 .../01-housekeep-log/7-cmd.out                     |   0
 {t => usr/t}/fcm-install-svn-hook/02-env.t         |   0
 {t => usr/t}/fcm-install-svn-hook/test_header      |   0
 {t => usr/t}/fcm-install-svn-hook/test_header_more |   0
 {t => usr/t}/fcm-keyword-print/00-simple.t         |   0
 {t => usr/t}/fcm-keyword-print/test_header         |   0
 {t => usr/t}/fcm-loc-layout/00-simple.t            |   0
 {t => usr/t}/fcm-loc-layout/test_header            |   0
 {t => usr/t}/fcm-make/00-build-basic.t             |   0
 {t => usr/t}/fcm-make/00-build-basic/bin/my-ld     |   0
 {t => usr/t}/fcm-make/00-build-basic/fcm-make.cfg  |   1 +
 {t => usr/t}/fcm-make/00-build-basic/src/hello.f90 |   0
 {t => usr/t}/fcm-make/00-build-basic/src/world.f90 |   0
 {t => usr/t}/fcm-make/01-build-link-opts           |   0
 {t => usr/t}/fcm-make/01-build-link-opts.t         |  30 +--------
 {t => usr/t}/fcm-make/02-build-ext-iface.t         |   0
 .../02-build-ext-iface/expected/t1.interface       |   0
 .../02-build-ext-iface/expected/t2.interface       |   0
 .../t}/fcm-make/02-build-ext-iface/fcm-make.cfg    |   0
 .../t}/fcm-make/02-build-ext-iface/src/m1.f90      |   0
 .../t}/fcm-make/02-build-ext-iface/src/t1.f90      |   0
 .../t}/fcm-make/02-build-ext-iface/src/t2.f90      |   0
 {t => usr/t}/fcm-make/03-build-include-paths.t     |   0
 .../fcm-make/03-build-include-paths/fcm-make.cfg   |   0
 .../include/world1/worldx.f90                      |   0
 .../include/world2/worldx.f90                      |   0
 .../fcm-make/03-build-include-paths/src/hello.f90  |   0
 .../fcm-make/03-build-include-paths/src/world.f90  |   0
 {t => usr/t}/fcm-make/04-build-libs.t              |   0
 {t => usr/t}/fcm-make/04-build-libs/fcm-make.cfg   |   0
 .../t}/fcm-make/04-build-libs/src-lib/earth.f90    |   0
 .../t}/fcm-make/04-build-libs/src-lib/greet.f90    |   0
 .../t}/fcm-make/04-build-libs/src-lib/moon.f90     |   0
 {t => usr/t}/fcm-make/04-build-libs/src/hello.f90  |   0
 {t => usr/t}/fcm-make/05-build-c-cxx-basic.t       |   0
 .../t}/fcm-make/05-build-c-cxx-basic/fcm-make.cfg  |   0
 .../t}/fcm-make/05-build-c-cxx-basic/src/chello.c  |   0
 .../fcm-make/05-build-c-cxx-basic/src/cxxhello.cxx |   0
 {t => usr/t}/fcm-make/06-extract-ssh.t             |   0
 {t => usr/t}/fcm-make/07-build-ns-dep.t            |   0
 {t => usr/t}/fcm-make/07-build-ns-dep/fcm-make.cfg |   0
 .../t}/fcm-make/07-build-ns-dep/src/lib/earth.f90  |   0
 .../t}/fcm-make/07-build-ns-dep/src/lib/greet.f90  |   0
 .../t}/fcm-make/07-build-ns-dep/src/main/hello.f90 |   0
 {t => usr/t}/fcm-make/08-build-dup-dep.t           |   0
 .../t}/fcm-make/08-build-dup-dep/fcm-make.cfg      |   0
 .../t}/fcm-make/08-build-dup-dep/src/lib/earth.f90 |   0
 .../t}/fcm-make/08-build-dup-dep/src/lib/greet.f90 |   0
 .../t}/fcm-make/08-build-dup-dep/src/lib/moon.f90  |   0
 .../fcm-make/08-build-dup-dep/src/main/hello.f90   |   0
 {t => usr/t}/fcm-make/09-build-dep-o.t             |   0
 {t => usr/t}/fcm-make/09-build-dep-o/fcm-make.cfg  |   0
 .../t}/fcm-make/09-build-dep-o/src/lib/earth.f90   |   0
 .../t}/fcm-make/09-build-dep-o/src/lib/greet.f90   |   0
 .../09-build-dep-o/src/lib/greet_fmt_mod.f90       |   0
 .../t}/fcm-make/09-build-dep-o/src/main/hello.f90  |   0
 .../t}/fcm-make/09-build-dep-o/src/main/hi.f90     |   0
 {t => usr/t}/fcm-make/10-log                       |   0
 {t => usr/t}/fcm-make/10-log.t                     |   8 ++-
 {t => usr/t}/fcm-make/11-preprocess-include-path.t |   0
 .../11-preprocess-include-path/fcm-make.cfg        |   0
 .../include/world1/worldx.h                        |   0
 .../include/world2/worldx.h                        |   0
 .../11-preprocess-include-path/src/world.F90       |   0
 {t => usr/t}/fcm-make/12-build-class-prop.t        |   0
 .../t}/fcm-make/12-build-class-prop/bin/my-fc      |   0
 .../t}/fcm-make/12-build-class-prop/fcm-make.cfg   |   0
 .../t}/fcm-make/12-build-class-prop/src/hello.f90  |   0
 .../12-build-class-prop/src/hello_house.f90        |   0
 .../12-build-class-prop/src/hello_office.f90       |   0
 .../12-build-class-prop/src/hello_road.f90         |   0
 {t => usr/t}/fcm-make/13-build-target-prop.t       |   0
 .../t}/fcm-make/13-build-target-prop/bin/my-fc     |   0
 .../t}/fcm-make/13-build-target-prop/fcm-make.cfg  |   0
 .../t}/fcm-make/13-build-target-prop/src/hello.f90 |   0
 .../t}/fcm-make/13-build-target-prop/src/world.f90 |   0
 {t => usr/t}/fcm-make/14-build-etc.t               |   0
 {t => usr/t}/fcm-make/14-build-etc/fcm-make.cfg    |   0
 {t => usr/t}/fcm-make/14-build-etc/src/foo         |   0
 {t => usr/t}/fcm-make/14-build-etc/src/hello.txt   |   0
 .../t}/fcm-make/14-build-etc/src/hi/hi-earth.txt   |   0
 .../t}/fcm-make/14-build-etc/src/hi/hi-mars.txt    |   0
 {t => usr/t}/fcm-make/15-extract-loc-reset.t       |   0
 {t => usr/t}/fcm-make/16-build-dep-o-2.t           |   0
 .../t}/fcm-make/16-build-dep-o-2/fcm-make.cfg      |   0
 .../t}/fcm-make/16-build-dep-o-2/src/hello.f90     |   0
 .../t}/fcm-make/16-build-dep-o-2/src/hello_mod.f90 |   0
 .../t}/fcm-make/16-build-dep-o-2/src/hello_sub.f90 |   0
 {t => usr/t}/fcm-make/17-build-cyclic.t            |   0
 {t => usr/t}/fcm-make/17-build-cyclic/fcm-make.cfg |   0
 {t => usr/t}/fcm-make/17-build-cyclic/src/bar.f90  |   0
 {t => usr/t}/fcm-make/17-build-cyclic/src/baz.f90  |   0
 {t => usr/t}/fcm-make/17-build-cyclic/src/foo.f90  |   0
 .../t}/fcm-make/17-build-cyclic/src/hello.f90      |   0
 {t => usr/t}/fcm-make/17-build-cyclic/src/meow.f90 |   0
 .../t}/fcm-make/17-build-cyclic/src/quack.f90      |   0
 {t => usr/t}/fcm-make/18-build-use-intrinsic.t     |   0
 .../fcm-make/18-build-use-intrinsic/fcm-make.cfg   |   0
 .../fcm-make/18-build-use-intrinsic/src/greet.f90  |   0
 .../fcm-make/18-build-use-intrinsic/src/hello.f90  |   0
 .../t}/fcm-make/18-build-use-intrinsic/src/hi.f90  |   0
 {t => usr/t}/fcm-make/19-build-inherit-prop.t      |   0
 .../t}/fcm-make/19-build-inherit-prop/fcm-make.cfg |   0
 .../fcm-make/19-build-inherit-prop/src/hello.F90   |   0
 {t => usr/t}/fcm-make/20-args.t                    |   0
 {t => usr/t}/fcm-make/20-args/fcm-make.cfg         |   0
 {t => usr/t}/fcm-make/20-args/src/greet.f90        |   0
 {t => usr/t}/fcm-make/20-args/src/hello.f90        |   0
 {t => usr/t}/fcm-make/21-inherit-steps.t           |   0
 .../t}/fcm-make/21-inherit-steps/fcm-make.cfg      |   0
 .../t}/fcm-make/21-inherit-steps/src1/hello.f90    |   0
 .../t}/fcm-make/21-inherit-steps/src2/salute.f90   |   0
 .../t}/fcm-make/21-inherit-steps/src3/greet.f90    |   0
 .../t}/fcm-make/22-build-2-bad-mod-over-inherit.t  |   0
 .../22-build-2-bad-mod-over-inherit/fcm-make.cfg   |   0
 .../22-build-2-bad-mod-over-inherit/src-i/m1.f90   |   0
 .../22-build-2-bad-mod-over-inherit/src-i/m2.f90   |   0
 .../22-build-2-bad-mod-over-inherit/src/m1.f90     |   0
 .../22-build-2-bad-mod-over-inherit/src/m2.f90     |   0
 .../22-build-2-bad-mod-over-inherit/src/p1.f90     |   0
 {t => usr/t}/fcm-make/23-build-omp.t               |   0
 {t => usr/t}/fcm-make/23-build-omp/fcm-make.cfg    |   0
 {t => usr/t}/fcm-make/23-build-omp/src/i1.f90      |   0
 {t => usr/t}/fcm-make/23-build-omp/src/i2.f90      |   0
 {t => usr/t}/fcm-make/23-build-omp/src/m1.f90      |   0
 {t => usr/t}/fcm-make/23-build-omp/src/m2.f90      |   0
 {t => usr/t}/fcm-make/23-build-omp/src/p1.f90      |   0
 {t => usr/t}/fcm-make/23-build-omp/src/s3.f90      |   0
 {t => usr/t}/fcm-make/24-build-c-main-camel.t      |   0
 .../t}/fcm-make/24-build-c-main-camel/fcm-make.cfg |   0
 .../t}/fcm-make/24-build-c-main-camel/src/Hello.c  |   0
 {t => usr/t}/fcm-make/25-build-cyclic-2.t          |   0
 .../t}/fcm-make/25-build-cyclic-2/fcm-make.cfg     |   0
 .../t}/fcm-make/25-build-cyclic-2/src/foo.f90      |   0
 {t => usr/t}/fcm-make/25-build-cyclic-2/src/m1.f90 |   0
 {t => usr/t}/fcm-make/25-build-cyclic-2/src/m2.f90 |   0
 {t => usr/t}/fcm-make/26-no-config.t               |   0
 {t => usr/t}/fcm-make/27-args-only.t               |   0
 {t => usr/t}/fcm-make/28-bad-arg.t                 |   0
 {t => usr/t}/fcm-make/29-relative-cfg.t            |   0
 {t => usr/t}/fcm-make/30-relative-cfg-in-svn.t     |   0
 {t => usr/t}/fcm-make/31-relative-cfg-in-ssh.t     |   0
 {t => usr/t}/fcm-make/32-include-relative-cfg.t    |   0
 .../t}/fcm-make/33-include-relative-cfg-in-svn.t   |   0
 .../t}/fcm-make/34-include-relative-cfg-in-ssh.t   |   0
 .../fcm-make/35-include-relative-cfg-in-2-dirs.t   |   0
 {t => usr/t}/fcm-make/36-build-fail-cont-basic.t   |   0
 .../fcm-make/36-build-fail-cont-basic/fcm-make.cfg |   0
 .../36-build-fail-cont-basic/src/greet_mod.f90     |   0
 .../36-build-fail-cont-basic/src/hello.f90         |   0
 .../36-build-fail-cont-basic/src/hello2.f90        |   0
 .../36-build-fail-cont-basic/src/hello3.f90        |   0
 .../36-build-fail-cont-basic/src/hello4.f90        |   0
 .../36-build-fail-cont-basic/src/hello_sub.f90     |   0
 .../36-build-fail-cont-basic/src/world_mod.f90     |   0
 {t => usr/t}/fcm-make/37-no-such-config-file.t     |   0
 .../t}/fcm-make/38-extract-inherit-set-primary.t   |   0
 {t => usr/t}/fcm-make/39-build-source-with-dot.t   |   0
 .../t}/fcm-make/40-extract-fs-source-with-dot.t    |   0
 {t => usr/t}/fcm-make/41-ctx-name.t                |   0
 {t => usr/t}/fcm-make/42-make-mirror-make2.t       |   0
 {t => usr/t}/fcm-make/43-ctx-name-inherit.t        |   0
 {t => usr/t}/fcm-make/44-ctx-name-inherit-compat.t |   0
 {t => usr/t}/fcm-make/45-dest-mv.t                 |   0
 {t => usr/t}/fcm-make/46-archive-mode.t            |   0
 .../t}/fcm-make/47-build-target-modifier-ns.t      |   0
 .../47-build-target-modifier-ns/fcm-make.cfg       |   0
 .../src/greet/greet.f90                            |   0
 .../47-build-target-modifier-ns/src/greet/world.nl |   0
 .../src/hello/hello.f90                            |   0
 .../47-build-target-modifier-ns/src/hello/world.nl |   0
 {t => usr/t}/fcm-make/48-build-sha1.t              |   0
 {t => usr/t}/fcm-make/48-build-sha1/fcm-make.cfg   |   0
 {t => usr/t}/fcm-make/48-build-sha1/src/hello.f90  |   0
 {t => usr/t}/fcm-make/49-build-c-more.t            |   0
 {t => usr/t}/fcm-make/49-build-c-more/fcm-make.cfg |   0
 {t => usr/t}/fcm-make/49-build-c-more/src/greet.c  |   0
 {t => usr/t}/fcm-make/49-build-c-more/src/hello.c  |   0
 {t => usr/t}/fcm-make/49-build-c-more/src/hi.c     |   0
 {t => usr/t}/fcm-make/50-build-target-dep.t        |   0
 .../t}/fcm-make/50-build-target-dep/fcm-make.cfg   |   0
 .../t}/fcm-make/50-build-target-dep/src/greet.f90  |   0
 .../50-build-target-dep/src/greet_world.f90        |   0
 {t => usr/t}/fcm-make/51-build-target-no-dep.t     |   0
 .../fcm-make/51-build-target-no-dep/fcm-make.cfg   |   0
 .../fcm-make/51-build-target-no-dep/src/greet.f90  |   0
 .../51-build-target-no-dep/src/greet_mod.f90       |   0
 .../51-build-target-no-dep/src/greet_world.f90     |   0
 .../51-build-target-no-dep/src2/hello_mod.f90      |   0
 {t => usr/t}/fcm-make/52-require-version.t         |   0
 {t => usr/t}/fcm-make/53-extract-conflict-incr.t   |   0
 .../t}/fcm-make/54-build-ignore-missing-dep-ns.t   |   0
 .../54-build-ignore-missing-dep-ns/fcm-make.cfg    |   0
 .../54-build-ignore-missing-dep-ns/src/greet.f90   |   0
 .../src/greet_mod.f90                              |   0
 .../src/greet_world.f90                            |   0
 .../src2/hello_mod.f90                             |   0
 {t => usr/t}/fcm-make/test_header                  |   0
 {t => usr/t}/fcm-merge/00-simple.t                 |   0
 {t => usr/t}/fcm-merge/01-complex.t                |   0
 {t => usr/t}/fcm-merge/02-reverse.t                |   0
 {t => usr/t}/fcm-merge/test_header                 |   0
 {t => usr/t}/fcm-recover-svn-repos/00-basic.t      |   0
 {t => usr/t}/fcm-recover-svn-repos/test_header     |   0
 {t => usr/t}/fcm-status/00-simple.t                |   0
 {t => usr/t}/fcm-status/test_header                |   0
 {t => usr/t}/fcm-switch/00-simple.t                |   0
 {t => usr/t}/fcm-switch/01-subtree.t               |   0
 {t => usr/t}/fcm-switch/test_header                |   0
 {t => usr/t}/fcm-update/00-simple.t                |   0
 {t => usr/t}/fcm-update/01-subtree.t               |   0
 {t => usr/t}/fcm-update/test_header                |   0
 {t => usr/t}/lib/bash/svn_test_header              |   0
 {t => usr/t}/lib/bash/test_header                  |   0
 {t => usr/t}/svn-hooks/00-pre-revprop-change.t     |   0
 {t => usr/t}/svn-hooks/01-post-revprop-change-bg.t |   0
 {t => usr/t}/svn-hooks/02-pre-commit.t             |   0
 {t => usr/t}/svn-hooks/03-post-commit-bg.t         |   0
 {t => usr/t}/svn-hooks/04-svnperms.t               |   0
 {t => usr/t}/svn-hooks/test_header                 |   0
 {t => usr/t}/svn-hooks/test_header_more            |   0
 {t => usr/t}/svn-username/00-branch.t              |   0
 {t => usr/t}/svn-username/test_header              |   0
 {test => usr/test}/compare_results_fcm1            |   0
 {test => usr/test}/compare_results_fcm2            |   0
 {test => usr/test}/compare_times_fcm1-2            |   0
 {test => usr/test}/create_hpc_batch_script         |   0
 {test => usr/test}/create_repos                    |   0
 {test => usr/test}/get_hpc_results                 |   0
 {test => usr/test}/perform_test_fcm1               |   0
 {test => usr/test}/perform_test_fcm2               |   0
 {test => usr/test}/report_hpc_results              |   0
 {test => usr/test}/repos/add_subroutine/hello.F90  |   0
 .../test}/repos/add_subroutine/hello.F90.add_lines |   0
 .../test}/repos/add_subroutine/hello_sub2.f90      |   0
 .../test}/repos/cyclic_dependency/hello.F90        |   0
 .../cyclic_dependency/hello_constants.f90.fail     |   0
 .../repos/cyclic_dependency/hello_constants.f90.ok |   0
 .../test}/repos/cyclic_dependency/hello_sub2.f90   |   0
 .../repos/trunk/blockdata/hello_blockdata.F90      |   0
 .../test}/repos/trunk/cfg/fcm1_add_directory.cfg   |   0
 .../repos/trunk/cfg/fcm1_add_directory_expsrc.cfg  |   0
 .../test}/repos/trunk/cfg/fcm1_add_file.cfg        |   0
 .../repos/trunk/cfg/fcm1_add_file_inherit.cfg      |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_base.cfg   |   0
 .../test}/repos/trunk/cfg/fcm1_base_inc.cfg        |   0
 .../test}/repos/trunk/cfg/fcm1_branches_clash.cfg  |   0
 .../test}/repos/trunk/cfg/fcm1_branches_merge.cfg  |   0
 .../cfg/fcm1_branches_merge_conflict_fail.cfg      |   0
 .../cfg/fcm1_branches_merge_conflict_override.cfg  |   0
 .../trunk/cfg/fcm1_branches_merge_inherit.cfg      |   0
 .../fcm1_branches_merge_inherit_wrong_include.cfg  |   0
 .../trunk/cfg/fcm1_branches_merge_wcopies.cfg      |   0
 .../repos/trunk/cfg/fcm1_branches_merge_wcopy.cfg  |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_cflags.cfg |   0
 .../test}/repos/trunk/cfg/fcm1_change_src_type.cfg |   0
 .../repos/trunk/cfg/fcm1_delete_directory.cfg      |   0
 .../trunk/cfg/fcm1_delete_directory_inherit.cfg    |   0
 .../test}/repos/trunk/cfg/fcm1_delete_file.cfg     |   0
 .../repos/trunk/cfg/fcm1_delete_file_inherit.cfg   |   0
 .../test}/repos/trunk/cfg/fcm1_delete_inc_file.cfg |   0
 .../trunk/cfg/fcm1_delete_inc_file_inherit.cfg     |   0
 .../cfg/fcm1_delete_inc_file_inherit_force.cfg     |   0
 .../test}/repos/trunk/cfg/fcm1_delete_pp_file.cfg  |   0
 .../trunk/cfg/fcm1_delete_pp_file_inherit.cfg      |   0
 .../repos/trunk/cfg/fcm1_delete_ppinc_file.cfg     |   0
 .../trunk/cfg/fcm1_delete_ppinc_file_inherit.cfg   |   0
 .../cfg/fcm1_delete_ppinc_file_inherit_force.cfg   |   0
 .../repos/trunk/cfg/fcm1_duplicate_target.cfg      |   0
 .../repos/trunk/cfg/fcm1_exclude_dependency.cfg    |   0
 .../test}/repos/trunk/cfg/fcm1_exe_permissions.cfg |   0
 .../test}/repos/trunk/cfg/fcm1_exe_rename.cfg      |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_fc.cfg     |   0
 .../test}/repos/trunk/cfg/fcm1_fflags1.cfg         |   0
 .../test}/repos/trunk/cfg/fcm1_fflags2.cfg         |   0
 .../test}/repos/trunk/cfg/fcm1_fflags_inherit.cfg  |   0
 .../test}/repos/trunk/cfg/fcm1_inc_devnull.cfg     |   0
 .../repos/trunk/cfg/fcm1_inherit_invalid_path.cfg  |   0
 .../test}/repos/trunk/cfg/fcm1_inherit_target.cfg  |   0
 .../repos/trunk/cfg/fcm1_invalid_base_url.cfg      |   0
 .../repos/trunk/cfg/fcm1_invalid_branch_url.cfg    |   0
 .../test}/repos/trunk/cfg/fcm1_invalid_inc.cfg     |   0
 .../repos/trunk/cfg/fcm1_invalid_namespace.cfg     |   0
 .../repos/trunk/cfg/fcm1_invalid_variable.cfg      |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_ld.cfg     |   0
 .../test}/repos/trunk/cfg/fcm1_library.cfg         |   0
 .../test}/repos/trunk/cfg/fcm1_library_rename.cfg  |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_mirror.cfg |   0
 .../test}/repos/trunk/cfg/fcm1_mirror_inherit.cfg  |   0
 .../trunk/cfg/fcm1_modify_subroutine_inherit.cfg   |   0
 .../fcm1_modify_subroutine_interface_inherit.cfg   |   0
 .../test}/repos/trunk/cfg/fcm1_multi_inherit.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_no_dep.cfg |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_ops.cfg    |   0
 .../test}/repos/trunk/cfg/fcm1_postproc_hpc.cfg    |   0
 .../repos/trunk/cfg/fcm1_pp_change_blockdata.cfg   |   0
 .../repos/trunk/cfg/fcm1_pp_change_dependency.cfg  |   0
 .../repos/trunk/cfg/fcm1_pp_change_include.cfg     |   0
 .../trunk/cfg/fcm1_pp_change_include_inherit.cfg   |   0
 .../repos/trunk/cfg/fcm1_pp_empty_subroutine.cfg   |   0
 .../trunk/cfg/fcm1_pp_empty_subroutine_inherit.cfg |   0
 .../cfg/fcm1_pp_empty_subroutine_inherit_force.cfg |   0
 .../test}/repos/trunk/cfg/fcm1_revmatch_false.cfg  |   0
 .../test}/repos/trunk/cfg/fcm1_revmatch_true.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_sps.cfg    |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_suite.cfg  |   0
 .../test}/repos/trunk/cfg/fcm1_symbolic_link.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_um.cfg     |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_um_hpc.cfg |   0
 .../test}/repos/trunk/cfg/fcm1_um_inherit.cfg      |   0
 .../test}/repos/trunk/cfg/fcm1_um_inherit_hpc.cfg  |   0
 {test => usr/test}/repos/trunk/cfg/fcm1_var.cfg    |   0
 .../test}/repos/trunk/cfg/fcm1_var_hpc.cfg         |   0
 .../repos/trunk/cfg/fcm2_add_directory_expsrc.cfg  |   0
 .../test}/repos/trunk/cfg/fcm2_add_file.cfg        |   0
 .../repos/trunk/cfg/fcm2_add_file_inherit.cfg      |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_base.cfg   |   0
 .../test}/repos/trunk/cfg/fcm2_base_inc.cfg        |   0
 .../test}/repos/trunk/cfg/fcm2_base_inc2.cfg       |   0
 .../test}/repos/trunk/cfg/fcm2_branches_clash.cfg  |   0
 .../test}/repos/trunk/cfg/fcm2_branches_merge.cfg  |   0
 .../trunk/cfg/fcm2_branches_merge_duplicate.cfg    |   0
 .../trunk/cfg/fcm2_branches_merge_inherit.cfg      |   0
 .../fcm2_branches_merge_inherit_wrong_include.cfg  |   0
 .../trunk/cfg/fcm2_branches_merge_wcopies.cfg      |   0
 .../repos/trunk/cfg/fcm2_branches_merge_wcopy.cfg  |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_cflags.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_change_variable.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_cyclic_dep_fail.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_cyclic_dep_ok.cfg   |   0
 .../repos/trunk/cfg/fcm2_delete_directory.cfg      |   0
 .../trunk/cfg/fcm2_delete_directory_inherit.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_delete_file.cfg     |   0
 .../repos/trunk/cfg/fcm2_delete_file_inherit.cfg   |   0
 .../test}/repos/trunk/cfg/fcm2_delete_inc_file.cfg |   0
 .../trunk/cfg/fcm2_delete_inc_file_inherit.cfg     |   0
 .../cfg/fcm2_delete_inc_file_inherit_force.cfg     |   0
 .../test}/repos/trunk/cfg/fcm2_delete_pp_file.cfg  |   0
 .../trunk/cfg/fcm2_delete_pp_file_inherit.cfg      |   0
 .../repos/trunk/cfg/fcm2_delete_ppinc_file.cfg     |   0
 .../trunk/cfg/fcm2_delete_ppinc_file_inherit.cfg   |   0
 .../cfg/fcm2_delete_ppinc_file_inherit_force.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_dep_o.cfg  |   0
 .../test}/repos/trunk/cfg/fcm2_dep_o_all.cfg       |   0
 .../test}/repos/trunk/cfg/fcm2_dep_o_invalid.cfg   |   0
 .../repos/trunk/cfg/fcm2_duplicate_target.cfg      |   0
 .../repos/trunk/cfg/fcm2_exclude_dependency.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_exe_permissions.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_exe_rename.cfg      |   0
 .../trunk/cfg/fcm2_extract_path_excl_no_ns.cfg     |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_fc.cfg     |   0
 .../test}/repos/trunk/cfg/fcm2_fflags1.cfg         |   0
 .../test}/repos/trunk/cfg/fcm2_fflags2.cfg         |   0
 .../test}/repos/trunk/cfg/fcm2_fflags_inherit.cfg  |   0
 .../test}/repos/trunk/cfg/fcm2_flag-output.cfg     |   0
 .../test}/repos/trunk/cfg/fcm2_inc_devnull.cfg     |   0
 .../repos/trunk/cfg/fcm2_inherit_invalid_path.cfg  |   0
 .../repos/trunk/cfg/fcm2_inherit_redefine_fail.cfg |   0
 .../repos/trunk/cfg/fcm2_inherit_redefine_ok.cfg   |   0
 .../repos/trunk/cfg/fcm2_invalid_base_url.cfg      |   0
 .../repos/trunk/cfg/fcm2_invalid_branch_url.cfg    |   0
 .../repos/trunk/cfg/fcm2_invalid_branch_url2.cfg   |   0
 .../test}/repos/trunk/cfg/fcm2_invalid_inc.cfg     |   0
 .../test}/repos/trunk/cfg/fcm2_invalid_label.cfg   |   0
 .../repos/trunk/cfg/fcm2_invalid_modifier.cfg      |   0
 .../repos/trunk/cfg/fcm2_invalid_modifiers.cfg     |   0
 .../repos/trunk/cfg/fcm2_invalid_namespace.cfg     |   0
 .../repos/trunk/cfg/fcm2_invalid_namespace2.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_invalid_target.cfg  |   0
 .../repos/trunk/cfg/fcm2_invalid_variable.cfg      |   0
 .../test}/repos/trunk/cfg/fcm2_library.cfg         |   0
 .../test}/repos/trunk/cfg/fcm2_library_rename.cfg  |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_mirror.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_mirror_after_pp.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_mirror_inherit.cfg  |   0
 .../repos/trunk/cfg/fcm2_mirror_inherit_fflags.cfg |   0
 .../trunk/cfg/fcm2_mirror_inherit_notarget.cfg     |   0
 .../trunk/cfg/fcm2_modify_subroutine_inherit.cfg   |   0
 .../fcm2_modify_subroutine_interface_inherit.cfg   |   0
 .../test}/repos/trunk/cfg/fcm2_multi_inherit.cfg   |   0
 .../test}/repos/trunk/cfg/fcm2_multiple_build.cfg  |   0
 .../trunk/cfg/fcm2_multiple_build_inherit.cfg      |   0
 .../repos/trunk/cfg/fcm2_multiple_pp-build.cfg     |   0
 .../trunk/cfg/fcm2_multiple_pp-build_inherit.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_no_dep.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_ns-dep_o.cfg        |   0
 .../test}/repos/trunk/cfg/fcm2_ns-dep_o_all.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_ns-dep_o_file.cfg   |   0
 .../repos/trunk/cfg/fcm2_ns-dep_o_invalid.cfg      |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_ops.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_postproc_hpc.cfg    |   0
 .../repos/trunk/cfg/fcm2_pp_change_blockdata.cfg   |   0
 .../repos/trunk/cfg/fcm2_pp_change_dependency.cfg  |   0
 .../repos/trunk/cfg/fcm2_pp_change_include.cfg     |   0
 .../trunk/cfg/fcm2_pp_change_include_inherit.cfg   |   0
 .../repos/trunk/cfg/fcm2_pp_empty_subroutine.cfg   |   0
 .../trunk/cfg/fcm2_pp_empty_subroutine_inherit.cfg |   0
 .../cfg/fcm2_pp_empty_subroutine_inherit_force.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_revmatch_false.cfg  |   0
 .../test}/repos/trunk/cfg/fcm2_single_file.cfg     |   0
 .../test}/repos/trunk/cfg/fcm2_space_in_name.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_sps.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_symbolic_link.cfg   |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_um.cfg     |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_um77.cfg   |   0
 .../test}/repos/trunk/cfg/fcm2_um77_hpc.cfg        |   0
 .../test}/repos/trunk/cfg/fcm2_um77_inherit.cfg    |   0
 .../repos/trunk/cfg/fcm2_um77_inherit_hpc.cfg      |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_um_hpc.cfg |   0
 .../test}/repos/trunk/cfg/fcm2_um_inherit.cfg      |   0
 .../test}/repos/trunk/cfg/fcm2_um_inherit_hpc.cfg  |   0
 {test => usr/test}/repos/trunk/cfg/fcm2_var.cfg    |   0
 .../test}/repos/trunk/cfg/fcm2_var_hpc.cfg         |   0
 .../test}/repos/trunk/module/hello_constants.f90   |   0
 .../test}/repos/trunk/module/hello_constants.inc   |   0
 .../repos/trunk/module/hello_constants_dummy.inc   |   0
 .../test}/repos/trunk/namelist/namelist.NL         |   0
 {test => usr/test}/repos/trunk/pro/hello.pro       |   0
 {test => usr/test}/repos/trunk/pro/plot.pro        |   0
 {test => usr/test}/repos/trunk/program/hello.F90   |   0
 {test => usr/test}/repos/trunk/script/hello.sh     |   0
 .../test}/repos/trunk/subroutine/hello_c.c         |   0
 .../test}/repos/trunk/subroutine/hello_sub.F90     |   0
 .../test}/repos/trunk/subroutine/hello_sub.h       |   0
 .../test}/repos/trunk/subroutine/hello_sub_dummy.h |   0
 {test => usr/test}/run_tests                       |   0
 {test => usr/test}/test_config/fcm1_add_directory  |   0
 .../test}/test_config/fcm1_add_directory_expsrc    |   0
 {test => usr/test}/test_config/fcm1_branches_clash |   0
 .../test_config/fcm1_branches_merge_conflict_fail  |   0
 .../test_config/fcm1_branches_merge_incremental    |   0
 .../fcm1_branches_merge_inherit_wrong_include      |   0
 .../test}/test_config/fcm1_branches_merge_wcopies  |   0
 .../test}/test_config/fcm1_branches_merge_wcopy    |   0
 .../test}/test_config/fcm1_cflags_incremental      |   0
 .../test_config/fcm1_change_src_type_incremental   |   0
 .../test}/test_config/fcm1_delete_directory        |   0
 .../test_config/fcm1_delete_directory_inherit      |   0
 {test => usr/test}/test_config/fcm1_delete_file    |   0
 .../test}/test_config/fcm1_delete_file_inherit     |   0
 .../test}/test_config/fcm1_delete_inc_file         |   0
 .../test}/test_config/fcm1_delete_inc_file_inherit |   0
 .../test_config/fcm1_delete_inc_file_inherit_force |   0
 {test => usr/test}/test_config/fcm1_delete_pp_file |   0
 .../test}/test_config/fcm1_delete_pp_file_inherit  |   0
 .../test}/test_config/fcm1_delete_ppinc_file       |   0
 .../test_config/fcm1_delete_ppinc_file_inherit     |   0
 .../fcm1_delete_ppinc_file_inherit_force           |   0
 .../test}/test_config/fcm1_duplicate_target        |   0
 .../test}/test_config/fcm1_exclude_dependency      |   0
 .../test}/test_config/fcm1_exe_permissions         |   0
 .../test}/test_config/fcm1_exe_rename_incremental  |   0
 {test => usr/test}/test_config/fcm1_fc_incremental |   0
 .../test}/test_config/fcm1_fflags_incremental      |   0
 {test => usr/test}/test_config/fcm1_inc_devnull    |   0
 .../test}/test_config/fcm1_inherit_invalid_path    |   0
 .../test}/test_config/fcm1_invalid_base_url        |   0
 .../test}/test_config/fcm1_invalid_branch_url      |   0
 {test => usr/test}/test_config/fcm1_invalid_inc    |   0
 .../test}/test_config/fcm1_invalid_namespace       |   0
 .../test}/test_config/fcm1_invalid_variable        |   0
 {test => usr/test}/test_config/fcm1_ld_incremental |   0
 {test => usr/test}/test_config/fcm1_library        |   0
 {test => usr/test}/test_config/fcm1_library_rename |   0
 {test => usr/test}/test_config/fcm1_mirror         |   0
 {test => usr/test}/test_config/fcm1_mirror_inherit |   0
 {test => usr/test}/test_config/fcm1_no_dep         |   0
 {test => usr/test}/test_config/fcm1_ops_parallel   |   0
 .../test_config/fcm1_pp_change_include_inherit     |   0
 .../test_config/fcm1_pp_change_keys_incremental    |   0
 .../test}/test_config/fcm1_pp_empty_subroutine     |   0
 .../test_config/fcm1_pp_empty_subroutine_inherit   |   0
 .../fcm1_pp_empty_subroutine_inherit_force         |   0
 {test => usr/test}/test_config/fcm1_revmatch_true  |   0
 {test => usr/test}/test_config/fcm1_sps_parallel   |   0
 {test => usr/test}/test_config/fcm1_um             |   0
 {test => usr/test}/test_config/fcm1_um_inherit     |   0
 {test => usr/test}/test_config/fcm1_var_parallel   |   0
 {test => usr/test}/test_config/fcm2_branches_clash |   0
 .../test_config/fcm2_branches_merge_incremental    |   0
 .../fcm2_branches_merge_inherit_wrong_include      |   0
 .../test}/test_config/fcm2_branches_merge_wcopies  |   0
 .../test}/test_config/fcm2_branches_merge_wcopy    |   0
 .../test}/test_config/fcm2_cflags_incremental      |   0
 .../test}/test_config/fcm2_cyclic_dep_fail         |   0
 {test => usr/test}/test_config/fcm2_delete_file    |   0
 .../test}/test_config/fcm2_delete_file_inherit     |   0
 .../test}/test_config/fcm2_delete_inc_file         |   0
 .../test}/test_config/fcm2_delete_inc_file_inherit |   0
 .../test_config/fcm2_delete_inc_file_inherit_force |   0
 {test => usr/test}/test_config/fcm2_delete_pp_file |   0
 .../test}/test_config/fcm2_delete_pp_file_inherit  |   0
 .../test}/test_config/fcm2_delete_ppinc_file       |   0
 .../test_config/fcm2_delete_ppinc_file_inherit     |   0
 .../fcm2_delete_ppinc_file_inherit_force           |   0
 {test => usr/test}/test_config/fcm2_dep_o_invalid  |   0
 .../test}/test_config/fcm2_duplicate_target        |   0
 .../test}/test_config/fcm2_exclude_dependency      |   0
 .../test}/test_config/fcm2_exe_permissions         |   0
 .../test}/test_config/fcm2_exe_rename_incremental  |   0
 {test => usr/test}/test_config/fcm2_fc_incremental |   0
 .../test}/test_config/fcm2_fflags_incremental      |   0
 {test => usr/test}/test_config/fcm2_inc_devnull    |   0
 .../test}/test_config/fcm2_inherit_invalid_path    |   0
 .../test}/test_config/fcm2_inherit_redefine_fail   |   0
 .../test}/test_config/fcm2_invalid_base_url        |   0
 .../test}/test_config/fcm2_invalid_branch_url      |   0
 .../test}/test_config/fcm2_invalid_branch_url2     |   0
 {test => usr/test}/test_config/fcm2_invalid_inc    |   0
 {test => usr/test}/test_config/fcm2_invalid_label  |   0
 .../test}/test_config/fcm2_invalid_modifier        |   0
 .../test}/test_config/fcm2_invalid_modifiers       |   0
 .../test}/test_config/fcm2_invalid_namespace       |   0
 .../test}/test_config/fcm2_invalid_namespace2      |   0
 {test => usr/test}/test_config/fcm2_invalid_target |   0
 .../test}/test_config/fcm2_invalid_variable        |   0
 {test => usr/test}/test_config/fcm2_library        |   0
 {test => usr/test}/test_config/fcm2_library_rename |   0
 {test => usr/test}/test_config/fcm2_mirror         |   0
 .../test}/test_config/fcm2_mirror_after_pp         |   0
 {test => usr/test}/test_config/fcm2_mirror_inherit |   0
 .../test}/test_config/fcm2_mirror_inherit_fflags   |   0
 .../test}/test_config/fcm2_mirror_inherit_notarget |   0
 .../test_config/fcm2_modify_subroutine_inherit     |   0
 {test => usr/test}/test_config/fcm2_multi_inherit  |   0
 {test => usr/test}/test_config/fcm2_no_dep         |   0
 .../test}/test_config/fcm2_ns-dep_o_invalid        |   0
 {test => usr/test}/test_config/fcm2_ops_parallel   |   0
 .../test}/test_config/fcm2_override_variable       |   0
 .../test_config/fcm2_pp_change_include_inherit     |   0
 .../test_config/fcm2_pp_change_keys_incremental    |   0
 .../test}/test_config/fcm2_pp_empty_subroutine     |   0
 .../test_config/fcm2_pp_empty_subroutine_inherit   |   0
 .../fcm2_pp_empty_subroutine_inherit_force         |   0
 {test => usr/test}/test_config/fcm2_sps_parallel   |   0
 {test => usr/test}/test_config/fcm2_um             |   0
 {test => usr/test}/test_config/fcm2_um77           |   0
 {test => usr/test}/test_config/fcm2_um77_inherit   |   0
 {test => usr/test}/test_config/fcm2_um_inherit     |   0
 {test => usr/test}/test_config/fcm2_var_parallel   |   0
 {test => usr/test}/test_include/inc/fortran.inc    |   0
 {test => usr/test}/test_include/prog/fortran.inc   |   0
 .../test}/test_include/prog/test_fortran_inc.f90   |   0
 .../test}/test_include/prog/test_prepro_inc.F90    |   0
 {test => usr/test}/test_include/test.sh            |   0
 {test => usr/test}/tests_functional.list           |   0
 {test => usr/test}/tests_perf_local.list           |   0
 {test => usr/test}/tests_perf_remote.list          |   0
 {test => usr/test}/wrapper_scripts/wrap_ar         |   0
 {test => usr/test}/wrapper_scripts/wrap_cc         |   0
 {test => usr/test}/wrapper_scripts/wrap_fc         |   0
 {test => usr/test}/wrapper_scripts/wrap_fc2        |   0
 {test => usr/test}/wrapper_scripts/wrap_ld         |   0
 {test => usr/test}/wrapper_scripts/wrap_ld2        |   0
 {test => usr/test}/wrapper_scripts/wrap_mpicc      |   0
 {test => usr/test}/wrapper_scripts/wrap_mpif90     |   0
 {test => usr/test}/wrapper_scripts/wrap_pp         |   0
 {tutorial => usr/tutorial}/README                  |   0
 .../tutorial}/fcm-tutorial-repos-create            |   0
 {tutorial => usr/tutorial}/hooks/pre-commit        |   0
 {tutorial => usr/tutorial}/trunk-r1/doc/hello.html |   0
 {tutorial => usr/tutorial}/trunk-r1/fcm-make.cfg   |   0
 .../trunk-r1/src/module/hello_constants.f90        |   0
 .../tutorial}/trunk-r1/src/module/hello_num.f90    |   0
 .../tutorial}/trunk-r1/src/program/hello.f90       |   0
 .../tutorial}/trunk-r1/src/subroutine/hello_c.c    |   0
 .../trunk-r1/src/subroutine/hello_sub.f90          |   0
 890 files changed, 89 insertions(+), 98 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a3b9d39
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+etc/fcm/*.cfg
diff --git a/doc/etc/fcm-version.js b/doc/etc/fcm-version.js
deleted file mode 100644
index 22c1b37..0000000
--- a/doc/etc/fcm-version.js
+++ /dev/null
@@ -1 +0,0 @@
-FCM.VERSION="2017.02.0";
diff --git a/ACKNOWLEDGEMENT.md b/usr/ACKNOWLEDGEMENT.md
similarity index 100%
rename from ACKNOWLEDGEMENT.md
rename to usr/ACKNOWLEDGEMENT.md
diff --git a/CHANGES.md b/usr/CHANGES.md
similarity index 97%
rename from CHANGES.md
rename to usr/CHANGES.md
index 65cfa70..3fd29de 100644
--- a/CHANGES.md
+++ b/usr/CHANGES.md
@@ -5,6 +5,23 @@ for a full listing of issues for each release.
 
 --------------------------------------------------------------------------------
 
+## 2017.09.0 (2017-09-27)
+
+FCM release 39.
+
+### Noteworthy Changes
+
+[#246](https://github.com/metomi/fcm/pull/246):
+fcm make: new `description` setting to allow users to specify any string to
+describe the current make.
+
+[#245](https://github.com/metomi/fcm/pull/245):
+fcm make: build: a link task for creating an executable will no longer create
+an archive library with the `ar` command before calling the linker. The linker
+command will contain the full list of object files instead.
+
+--------------------------------------------------------------------------------
+
 ## 2017.02.0 (2017-02-24)
 
 FCM release 38.
diff --git a/CONTRIBUTING.md b/usr/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to usr/CONTRIBUTING.md
diff --git a/COPYING b/usr/COPYING
similarity index 100%
rename from COPYING
rename to usr/COPYING
diff --git a/README.md b/usr/README.md
similarity index 100%
rename from README.md
rename to usr/README.md
diff --git a/doc/collaboration/feeding-back-patch.png b/usr/doc/collaboration/feeding-back-patch.png
similarity index 100%
rename from doc/collaboration/feeding-back-patch.png
rename to usr/doc/collaboration/feeding-back-patch.png
diff --git a/doc/collaboration/index.html b/usr/doc/collaboration/index.html
similarity index 100%
rename from doc/collaboration/index.html
rename to usr/doc/collaboration/index.html
diff --git a/doc/collaboration/managing-local-changes.png b/usr/doc/collaboration/managing-local-changes.png
similarity index 100%
rename from doc/collaboration/managing-local-changes.png
rename to usr/doc/collaboration/managing-local-changes.png
diff --git a/doc/collaboration/merging-patch-multi.png b/usr/doc/collaboration/merging-patch-multi.png
similarity index 100%
rename from doc/collaboration/merging-patch-multi.png
rename to usr/doc/collaboration/merging-patch-multi.png
diff --git a/doc/collaboration/merging-patch-one.png b/usr/doc/collaboration/merging-patch-one.png
similarity index 100%
rename from doc/collaboration/merging-patch-one.png
rename to usr/doc/collaboration/merging-patch-one.png
diff --git a/doc/collaboration/mirroring-trunk.png b/usr/doc/collaboration/mirroring-trunk.png
similarity index 100%
rename from doc/collaboration/mirroring-trunk.png
rename to usr/doc/collaboration/mirroring-trunk.png
diff --git a/doc/collaboration/updating-branch.png b/usr/doc/collaboration/updating-branch.png
similarity index 100%
rename from doc/collaboration/updating-branch.png
rename to usr/doc/collaboration/updating-branch.png
diff --git a/doc/collaboration/updating-shared-branch.png b/usr/doc/collaboration/updating-shared-branch.png
similarity index 100%
rename from doc/collaboration/updating-shared-branch.png
rename to usr/doc/collaboration/updating-shared-branch.png
diff --git a/doc/collaboration/working-as-collaborator.png b/usr/doc/collaboration/working-as-collaborator.png
similarity index 100%
rename from doc/collaboration/working-as-collaborator.png
rename to usr/doc/collaboration/working-as-collaborator.png
diff --git a/doc/etc/bootstrap/css/bootstrap-theme.css b/usr/doc/etc/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap-theme.css
rename to usr/doc/etc/bootstrap/css/bootstrap-theme.css
diff --git a/doc/etc/bootstrap/css/bootstrap-theme.css.map b/usr/doc/etc/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap-theme.css.map
rename to usr/doc/etc/bootstrap/css/bootstrap-theme.css.map
diff --git a/doc/etc/bootstrap/css/bootstrap-theme.min.css b/usr/doc/etc/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap-theme.min.css
rename to usr/doc/etc/bootstrap/css/bootstrap-theme.min.css
diff --git a/doc/etc/bootstrap/css/bootstrap-theme.min.css.map b/usr/doc/etc/bootstrap/css/bootstrap-theme.min.css.map
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap-theme.min.css.map
rename to usr/doc/etc/bootstrap/css/bootstrap-theme.min.css.map
diff --git a/doc/etc/bootstrap/css/bootstrap.css b/usr/doc/etc/bootstrap/css/bootstrap.css
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap.css
rename to usr/doc/etc/bootstrap/css/bootstrap.css
diff --git a/doc/etc/bootstrap/css/bootstrap.css.map b/usr/doc/etc/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap.css.map
rename to usr/doc/etc/bootstrap/css/bootstrap.css.map
diff --git a/doc/etc/bootstrap/css/bootstrap.min.css b/usr/doc/etc/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap.min.css
rename to usr/doc/etc/bootstrap/css/bootstrap.min.css
diff --git a/doc/etc/bootstrap/css/bootstrap.min.css.map b/usr/doc/etc/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from doc/etc/bootstrap/css/bootstrap.min.css.map
rename to usr/doc/etc/bootstrap/css/bootstrap.min.css.map
diff --git a/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.eot b/usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from doc/etc/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.svg b/usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from doc/etc/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.ttf b/usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from doc/etc/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff b/usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff2
rename to usr/doc/etc/bootstrap/fonts/glyphicons-halflings-regular.woff2
diff --git a/doc/etc/bootstrap/js/bootstrap.js b/usr/doc/etc/bootstrap/js/bootstrap.js
similarity index 100%
rename from doc/etc/bootstrap/js/bootstrap.js
rename to usr/doc/etc/bootstrap/js/bootstrap.js
diff --git a/doc/etc/bootstrap/js/bootstrap.min.js b/usr/doc/etc/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from doc/etc/bootstrap/js/bootstrap.min.js
rename to usr/doc/etc/bootstrap/js/bootstrap.min.js
diff --git a/doc/etc/bootstrap/js/npm.js b/usr/doc/etc/bootstrap/js/npm.js
similarity index 100%
rename from doc/etc/bootstrap/js/npm.js
rename to usr/doc/etc/bootstrap/js/npm.js
diff --git a/doc/etc/fcm-icon.png b/usr/doc/etc/fcm-icon.png
similarity index 100%
rename from doc/etc/fcm-icon.png
rename to usr/doc/etc/fcm-icon.png
diff --git a/doc/etc/fcm-terms-of-use.html b/usr/doc/etc/fcm-terms-of-use.html
similarity index 100%
rename from doc/etc/fcm-terms-of-use.html
rename to usr/doc/etc/fcm-terms-of-use.html
diff --git a/usr/doc/etc/fcm-version.js b/usr/doc/etc/fcm-version.js
new file mode 100644
index 0000000..a851ca2
--- /dev/null
+++ b/usr/doc/etc/fcm-version.js
@@ -0,0 +1 @@
+FCM.VERSION="2017.09.0";
diff --git a/doc/etc/fcm.css b/usr/doc/etc/fcm.css
similarity index 100%
rename from doc/etc/fcm.css
rename to usr/doc/etc/fcm.css
diff --git a/doc/etc/fcm.js b/usr/doc/etc/fcm.js
similarity index 100%
rename from doc/etc/fcm.js
rename to usr/doc/etc/fcm.js
diff --git a/doc/etc/fcm.png b/usr/doc/etc/fcm.png
similarity index 100%
rename from doc/etc/fcm.png
rename to usr/doc/etc/fcm.png
diff --git a/doc/etc/jquery.min.js b/usr/doc/etc/jquery.min.js
similarity index 100%
rename from doc/etc/jquery.min.js
rename to usr/doc/etc/jquery.min.js
diff --git a/doc/etc/moment.min.js b/usr/doc/etc/moment.min.js
similarity index 100%
rename from doc/etc/moment.min.js
rename to usr/doc/etc/moment.min.js
diff --git a/doc/index.html b/usr/doc/index.html
similarity index 100%
rename from doc/index.html
rename to usr/doc/index.html
diff --git a/doc/installation/index.html b/usr/doc/installation/index.html
similarity index 100%
rename from doc/installation/index.html
rename to usr/doc/installation/index.html
diff --git a/doc/release_notes/1-1.html b/usr/doc/release_notes/1-1.html
similarity index 100%
rename from doc/release_notes/1-1.html
rename to usr/doc/release_notes/1-1.html
diff --git a/doc/release_notes/1-2.html b/usr/doc/release_notes/1-2.html
similarity index 100%
rename from doc/release_notes/1-2.html
rename to usr/doc/release_notes/1-2.html
diff --git a/doc/release_notes/1-3.html b/usr/doc/release_notes/1-3.html
similarity index 100%
rename from doc/release_notes/1-3.html
rename to usr/doc/release_notes/1-3.html
diff --git a/doc/release_notes/1-4.html b/usr/doc/release_notes/1-4.html
similarity index 100%
rename from doc/release_notes/1-4.html
rename to usr/doc/release_notes/1-4.html
diff --git a/doc/release_notes/1-5.html b/usr/doc/release_notes/1-5.html
similarity index 100%
rename from doc/release_notes/1-5.html
rename to usr/doc/release_notes/1-5.html
diff --git a/doc/release_notes/2-0.html b/usr/doc/release_notes/2-0.html
similarity index 100%
rename from doc/release_notes/2-0.html
rename to usr/doc/release_notes/2-0.html
diff --git a/doc/release_notes/2-1.html b/usr/doc/release_notes/2-1.html
similarity index 100%
rename from doc/release_notes/2-1.html
rename to usr/doc/release_notes/2-1.html
diff --git a/doc/release_notes/2-2.html b/usr/doc/release_notes/2-2.html
similarity index 100%
rename from doc/release_notes/2-2.html
rename to usr/doc/release_notes/2-2.html
diff --git a/doc/release_notes/2-3-1.html b/usr/doc/release_notes/2-3-1.html
similarity index 100%
rename from doc/release_notes/2-3-1.html
rename to usr/doc/release_notes/2-3-1.html
diff --git a/doc/release_notes/2-3.html b/usr/doc/release_notes/2-3.html
similarity index 100%
rename from doc/release_notes/2-3.html
rename to usr/doc/release_notes/2-3.html
diff --git a/doc/release_notes/index.html b/usr/doc/release_notes/index.html
similarity index 100%
rename from doc/release_notes/index.html
rename to usr/doc/release_notes/index.html
diff --git a/doc/user_guide/annex_bld_cfg.html b/usr/doc/user_guide/annex_bld_cfg.html
similarity index 100%
rename from doc/user_guide/annex_bld_cfg.html
rename to usr/doc/user_guide/annex_bld_cfg.html
diff --git a/doc/user_guide/annex_cfg.html b/usr/doc/user_guide/annex_cfg.html
similarity index 99%
rename from doc/user_guide/annex_cfg.html
rename to usr/doc/user_guide/annex_cfg.html
index 6a0d1f4..af8a02b 100644
--- a/doc/user_guide/annex_cfg.html
+++ b/usr/doc/user_guide/annex_cfg.html
@@ -508,6 +508,20 @@ build.prop{fc.flags}[foo/bar] = -O1
   "make.html">FCM Make</a>.</p>
 
   <dl>
+    <dt id="make.description">description</dt>
+
+    <dd>
+      <p><dfn>description</dfn>: Specifies a description string for the current
+      make.</p>
+
+      <p><dfn>value</dfn>: A string.</p>
+
+      <p><dfn>example</dfn>:</p>
+      <pre>
+description = Release 2.71.82
+</pre>
+    </dd>
+
     <dt id="make.dest">dest</dt>
 
     <dd>
@@ -1322,11 +1336,8 @@ build.prop{fc.libs}[myprog.exe] = netcdf grib
 
     <dt id="make.build.prop.keep-lib-o">keep-lib-o</dt>
 
-    <dd>Relevant when linking a binary executable. If <kbd>true</kbd>, create
-    and keep the dependent object library as <samp>lib/libNAME.a</samp>, where
-    <var>NAME</var> is the root name of the executable. The normal behaviour is
-    to create the dependent object library in a temporary directory, which is
-    removed after the linker command is completed.</dd>
+    <dd>Obsolete. This setting does nothing and is retained only for backward
+    compatibility.</dd>
 
     <dt id="make.build.prop.ld">ld</dt>
 
diff --git a/doc/user_guide/annex_ext_cfg.html b/usr/doc/user_guide/annex_ext_cfg.html
similarity index 100%
rename from doc/user_guide/annex_ext_cfg.html
rename to usr/doc/user_guide/annex_ext_cfg.html
diff --git a/doc/user_guide/annex_fcm_cfg.html b/usr/doc/user_guide/annex_fcm_cfg.html
similarity index 100%
rename from doc/user_guide/annex_fcm_cfg.html
rename to usr/doc/user_guide/annex_fcm_cfg.html
diff --git a/doc/user_guide/annex_quick_ref.html b/usr/doc/user_guide/annex_quick_ref.html
similarity index 100%
rename from doc/user_guide/annex_quick_ref.html
rename to usr/doc/user_guide/annex_quick_ref.html
diff --git a/doc/user_guide/annex_quick_ref_tree_conflicts.html b/usr/doc/user_guide/annex_quick_ref_tree_conflicts.html
similarity index 100%
rename from doc/user_guide/annex_quick_ref_tree_conflicts.html
rename to usr/doc/user_guide/annex_quick_ref_tree_conflicts.html
diff --git a/doc/user_guide/api.html b/usr/doc/user_guide/api.html
similarity index 100%
rename from doc/user_guide/api.html
rename to usr/doc/user_guide/api.html
diff --git a/doc/user_guide/build.html b/usr/doc/user_guide/build.html
similarity index 100%
rename from doc/user_guide/build.html
rename to usr/doc/user_guide/build.html
diff --git a/doc/user_guide/changeset.png b/usr/doc/user_guide/changeset.png
similarity index 100%
rename from doc/user_guide/changeset.png
rename to usr/doc/user_guide/changeset.png
diff --git a/doc/user_guide/code_management.html b/usr/doc/user_guide/code_management.html
similarity index 100%
rename from doc/user_guide/code_management.html
rename to usr/doc/user_guide/code_management.html
diff --git a/doc/user_guide/command_ref.html b/usr/doc/user_guide/command_ref.html
similarity index 100%
rename from doc/user_guide/command_ref.html
rename to usr/doc/user_guide/command_ref.html
diff --git a/doc/user_guide/create_branch.png b/usr/doc/user_guide/create_branch.png
similarity index 100%
rename from doc/user_guide/create_branch.png
rename to usr/doc/user_guide/create_branch.png
diff --git a/doc/user_guide/extract.html b/usr/doc/user_guide/extract.html
similarity index 100%
rename from doc/user_guide/extract.html
rename to usr/doc/user_guide/extract.html
diff --git a/doc/user_guide/fcm_overview.png b/usr/doc/user_guide/fcm_overview.png
similarity index 100%
rename from doc/user_guide/fcm_overview.png
rename to usr/doc/user_guide/fcm_overview.png
diff --git a/doc/user_guide/getting_started.html b/usr/doc/user_guide/getting_started.html
similarity index 100%
rename from doc/user_guide/getting_started.html
rename to usr/doc/user_guide/getting_started.html
diff --git a/doc/user_guide/gui1.png b/usr/doc/user_guide/gui1.png
similarity index 100%
rename from doc/user_guide/gui1.png
rename to usr/doc/user_guide/gui1.png
diff --git a/doc/user_guide/gui2.png b/usr/doc/user_guide/gui2.png
similarity index 100%
rename from doc/user_guide/gui2.png
rename to usr/doc/user_guide/gui2.png
diff --git a/doc/user_guide/index.html b/usr/doc/user_guide/index.html
similarity index 100%
rename from doc/user_guide/index.html
rename to usr/doc/user_guide/index.html
diff --git a/doc/user_guide/introduction.html b/usr/doc/user_guide/introduction.html
similarity index 100%
rename from doc/user_guide/introduction.html
rename to usr/doc/user_guide/introduction.html
diff --git a/doc/user_guide/make.html b/usr/doc/user_guide/make.html
similarity index 100%
rename from doc/user_guide/make.html
rename to usr/doc/user_guide/make.html
diff --git a/doc/user_guide/overview.html b/usr/doc/user_guide/overview.html
similarity index 100%
rename from doc/user_guide/overview.html
rename to usr/doc/user_guide/overview.html
diff --git a/doc/user_guide/system_admin.html b/usr/doc/user_guide/system_admin.html
similarity index 100%
rename from doc/user_guide/system_admin.html
rename to usr/doc/user_guide/system_admin.html
diff --git a/doc/user_guide/working_practices.html b/usr/doc/user_guide/working_practices.html
similarity index 100%
rename from doc/user_guide/working_practices.html
rename to usr/doc/user_guide/working_practices.html
diff --git a/doc/user_guide/xxdiff1.png b/usr/doc/user_guide/xxdiff1.png
similarity index 100%
rename from doc/user_guide/xxdiff1.png
rename to usr/doc/user_guide/xxdiff1.png
diff --git a/doc/user_guide/xxdiff2.png b/usr/doc/user_guide/xxdiff2.png
similarity index 100%
rename from doc/user_guide/xxdiff2.png
rename to usr/doc/user_guide/xxdiff2.png
diff --git a/doc/user_guide/xxdiff_tutorial.png b/usr/doc/user_guide/xxdiff_tutorial.png
similarity index 100%
rename from doc/user_guide/xxdiff_tutorial.png
rename to usr/doc/user_guide/xxdiff_tutorial.png
diff --git a/etc/fcm/admin.cfg.example b/usr/etc/fcm/admin.cfg.example
similarity index 100%
rename from etc/fcm/admin.cfg.example
rename to usr/etc/fcm/admin.cfg.example
diff --git a/etc/fcm/external.cfg.example b/usr/etc/fcm/external.cfg.example
similarity index 100%
rename from etc/fcm/external.cfg.example
rename to usr/etc/fcm/external.cfg.example
diff --git a/etc/fcm/keyword.cfg.example b/usr/etc/fcm/keyword.cfg.example
similarity index 100%
rename from etc/fcm/keyword.cfg.example
rename to usr/etc/fcm/keyword.cfg.example
diff --git a/etc/fcm/make.cfg.example b/usr/etc/fcm/make.cfg.example
similarity index 100%
rename from etc/fcm/make.cfg.example
rename to usr/etc/fcm/make.cfg.example
diff --git a/etc/svn-hooks/post-commit b/usr/etc/svn-hooks/post-commit
similarity index 100%
rename from etc/svn-hooks/post-commit
rename to usr/etc/svn-hooks/post-commit
diff --git a/etc/svn-hooks/post-revprop-change b/usr/etc/svn-hooks/post-revprop-change
similarity index 100%
rename from etc/svn-hooks/post-revprop-change
rename to usr/etc/svn-hooks/post-revprop-change
diff --git a/etc/svn-hooks/pre-commit b/usr/etc/svn-hooks/pre-commit
similarity index 100%
rename from etc/svn-hooks/pre-commit
rename to usr/etc/svn-hooks/pre-commit
diff --git a/etc/svn-hooks/pre-revprop-change b/usr/etc/svn-hooks/pre-revprop-change
similarity index 100%
rename from etc/svn-hooks/pre-revprop-change
rename to usr/etc/svn-hooks/pre-revprop-change
diff --git a/index.html b/usr/index.html
similarity index 100%
rename from index.html
rename to usr/index.html
diff --git a/lib/FCM/Admin/Config.pm b/usr/lib/FCM/Admin/Config.pm
similarity index 100%
rename from lib/FCM/Admin/Config.pm
rename to usr/lib/FCM/Admin/Config.pm
diff --git a/lib/FCM/Admin/Project.pm b/usr/lib/FCM/Admin/Project.pm
similarity index 100%
rename from lib/FCM/Admin/Project.pm
rename to usr/lib/FCM/Admin/Project.pm
diff --git a/lib/FCM/Admin/Runner.pm b/usr/lib/FCM/Admin/Runner.pm
similarity index 100%
rename from lib/FCM/Admin/Runner.pm
rename to usr/lib/FCM/Admin/Runner.pm
diff --git a/lib/FCM/Admin/System.pm b/usr/lib/FCM/Admin/System.pm
similarity index 100%
rename from lib/FCM/Admin/System.pm
rename to usr/lib/FCM/Admin/System.pm
diff --git a/lib/FCM/Admin/User.pm b/usr/lib/FCM/Admin/User.pm
similarity index 100%
rename from lib/FCM/Admin/User.pm
rename to usr/lib/FCM/Admin/User.pm
diff --git a/lib/FCM/Admin/Users/LDAP.pm b/usr/lib/FCM/Admin/Users/LDAP.pm
similarity index 100%
rename from lib/FCM/Admin/Users/LDAP.pm
rename to usr/lib/FCM/Admin/Users/LDAP.pm
diff --git a/lib/FCM/Admin/Users/Passwd.pm b/usr/lib/FCM/Admin/Users/Passwd.pm
similarity index 100%
rename from lib/FCM/Admin/Users/Passwd.pm
rename to usr/lib/FCM/Admin/Users/Passwd.pm
diff --git a/lib/FCM/Admin/Util.pm b/usr/lib/FCM/Admin/Util.pm
similarity index 100%
rename from lib/FCM/Admin/Util.pm
rename to usr/lib/FCM/Admin/Util.pm
diff --git a/lib/FCM/CLI.pm b/usr/lib/FCM/CLI.pm
similarity index 100%
rename from lib/FCM/CLI.pm
rename to usr/lib/FCM/CLI.pm
diff --git a/lib/FCM/CLI/Exception.pm b/usr/lib/FCM/CLI/Exception.pm
similarity index 100%
rename from lib/FCM/CLI/Exception.pm
rename to usr/lib/FCM/CLI/Exception.pm
diff --git a/lib/FCM/CLI/Parser.pm b/usr/lib/FCM/CLI/Parser.pm
similarity index 100%
rename from lib/FCM/CLI/Parser.pm
rename to usr/lib/FCM/CLI/Parser.pm
diff --git a/lib/FCM/CLI/fcm-add.pod b/usr/lib/FCM/CLI/fcm-add.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-add.pod
rename to usr/lib/FCM/CLI/fcm-add.pod
diff --git a/lib/FCM/CLI/fcm-branch-create.pod b/usr/lib/FCM/CLI/fcm-branch-create.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-branch-create.pod
rename to usr/lib/FCM/CLI/fcm-branch-create.pod
diff --git a/lib/FCM/CLI/fcm-branch-delete.pod b/usr/lib/FCM/CLI/fcm-branch-delete.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-branch-delete.pod
rename to usr/lib/FCM/CLI/fcm-branch-delete.pod
diff --git a/lib/FCM/CLI/fcm-branch-diff.pod b/usr/lib/FCM/CLI/fcm-branch-diff.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-branch-diff.pod
rename to usr/lib/FCM/CLI/fcm-branch-diff.pod
diff --git a/lib/FCM/CLI/fcm-branch-info.pod b/usr/lib/FCM/CLI/fcm-branch-info.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-branch-info.pod
rename to usr/lib/FCM/CLI/fcm-branch-info.pod
diff --git a/lib/FCM/CLI/fcm-branch-list.pod b/usr/lib/FCM/CLI/fcm-branch-list.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-branch-list.pod
rename to usr/lib/FCM/CLI/fcm-branch-list.pod
diff --git a/lib/FCM/CLI/fcm-branch.pod b/usr/lib/FCM/CLI/fcm-branch.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-branch.pod
rename to usr/lib/FCM/CLI/fcm-branch.pod
diff --git a/lib/FCM/CLI/fcm-browse.pod b/usr/lib/FCM/CLI/fcm-browse.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-browse.pod
rename to usr/lib/FCM/CLI/fcm-browse.pod
diff --git a/lib/FCM/CLI/fcm-build.pod b/usr/lib/FCM/CLI/fcm-build.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-build.pod
rename to usr/lib/FCM/CLI/fcm-build.pod
diff --git a/lib/FCM/CLI/fcm-cfg-print.pod b/usr/lib/FCM/CLI/fcm-cfg-print.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-cfg-print.pod
rename to usr/lib/FCM/CLI/fcm-cfg-print.pod
diff --git a/lib/FCM/CLI/fcm-changelist.pod b/usr/lib/FCM/CLI/fcm-changelist.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-changelist.pod
rename to usr/lib/FCM/CLI/fcm-changelist.pod
diff --git a/lib/FCM/CLI/fcm-cmp-ext-cfg.pod b/usr/lib/FCM/CLI/fcm-cmp-ext-cfg.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-cmp-ext-cfg.pod
rename to usr/lib/FCM/CLI/fcm-cmp-ext-cfg.pod
diff --git a/lib/FCM/CLI/fcm-commit.pod b/usr/lib/FCM/CLI/fcm-commit.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-commit.pod
rename to usr/lib/FCM/CLI/fcm-commit.pod
diff --git a/lib/FCM/CLI/fcm-conflicts.pod b/usr/lib/FCM/CLI/fcm-conflicts.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-conflicts.pod
rename to usr/lib/FCM/CLI/fcm-conflicts.pod
diff --git a/lib/FCM/CLI/fcm-delete.pod b/usr/lib/FCM/CLI/fcm-delete.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-delete.pod
rename to usr/lib/FCM/CLI/fcm-delete.pod
diff --git a/lib/FCM/CLI/fcm-diff.pod b/usr/lib/FCM/CLI/fcm-diff.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-diff.pod
rename to usr/lib/FCM/CLI/fcm-diff.pod
diff --git a/lib/FCM/CLI/fcm-export-items.pod b/usr/lib/FCM/CLI/fcm-export-items.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-export-items.pod
rename to usr/lib/FCM/CLI/fcm-export-items.pod
diff --git a/lib/FCM/CLI/fcm-extract.pod b/usr/lib/FCM/CLI/fcm-extract.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-extract.pod
rename to usr/lib/FCM/CLI/fcm-extract.pod
diff --git a/lib/FCM/CLI/fcm-gui.pod b/usr/lib/FCM/CLI/fcm-gui.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-gui.pod
rename to usr/lib/FCM/CLI/fcm-gui.pod
diff --git a/lib/FCM/CLI/fcm-help.pod b/usr/lib/FCM/CLI/fcm-help.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-help.pod
rename to usr/lib/FCM/CLI/fcm-help.pod
diff --git a/lib/FCM/CLI/fcm-keyword-print.pod b/usr/lib/FCM/CLI/fcm-keyword-print.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-keyword-print.pod
rename to usr/lib/FCM/CLI/fcm-keyword-print.pod
diff --git a/lib/FCM/CLI/fcm-loc-layout.pod b/usr/lib/FCM/CLI/fcm-loc-layout.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-loc-layout.pod
rename to usr/lib/FCM/CLI/fcm-loc-layout.pod
diff --git a/lib/FCM/CLI/fcm-make.pod b/usr/lib/FCM/CLI/fcm-make.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-make.pod
rename to usr/lib/FCM/CLI/fcm-make.pod
diff --git a/lib/FCM/CLI/fcm-merge.pod b/usr/lib/FCM/CLI/fcm-merge.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-merge.pod
rename to usr/lib/FCM/CLI/fcm-merge.pod
diff --git a/lib/FCM/CLI/fcm-mkpatch.pod b/usr/lib/FCM/CLI/fcm-mkpatch.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-mkpatch.pod
rename to usr/lib/FCM/CLI/fcm-mkpatch.pod
diff --git a/lib/FCM/CLI/fcm-project-create.pod b/usr/lib/FCM/CLI/fcm-project-create.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-project-create.pod
rename to usr/lib/FCM/CLI/fcm-project-create.pod
diff --git a/lib/FCM/CLI/fcm-switch.pod b/usr/lib/FCM/CLI/fcm-switch.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-switch.pod
rename to usr/lib/FCM/CLI/fcm-switch.pod
diff --git a/lib/FCM/CLI/fcm-test-battery.pod b/usr/lib/FCM/CLI/fcm-test-battery.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-test-battery.pod
rename to usr/lib/FCM/CLI/fcm-test-battery.pod
diff --git a/lib/FCM/CLI/fcm-update.pod b/usr/lib/FCM/CLI/fcm-update.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-update.pod
rename to usr/lib/FCM/CLI/fcm-update.pod
diff --git a/lib/FCM/CLI/fcm-version.pod b/usr/lib/FCM/CLI/fcm-version.pod
similarity index 100%
rename from lib/FCM/CLI/fcm-version.pod
rename to usr/lib/FCM/CLI/fcm-version.pod
diff --git a/lib/FCM/Class/CODE.pm b/usr/lib/FCM/Class/CODE.pm
similarity index 100%
rename from lib/FCM/Class/CODE.pm
rename to usr/lib/FCM/Class/CODE.pm
diff --git a/lib/FCM/Class/Exception.pm b/usr/lib/FCM/Class/Exception.pm
similarity index 100%
rename from lib/FCM/Class/Exception.pm
rename to usr/lib/FCM/Class/Exception.pm
diff --git a/lib/FCM/Class/HASH.pm b/usr/lib/FCM/Class/HASH.pm
similarity index 100%
rename from lib/FCM/Class/HASH.pm
rename to usr/lib/FCM/Class/HASH.pm
diff --git a/lib/FCM/Context/ConfigEntry.pm b/usr/lib/FCM/Context/ConfigEntry.pm
similarity index 100%
rename from lib/FCM/Context/ConfigEntry.pm
rename to usr/lib/FCM/Context/ConfigEntry.pm
diff --git a/lib/FCM/Context/Event.pm b/usr/lib/FCM/Context/Event.pm
similarity index 100%
rename from lib/FCM/Context/Event.pm
rename to usr/lib/FCM/Context/Event.pm
diff --git a/lib/FCM/Context/Keyword.pm b/usr/lib/FCM/Context/Keyword.pm
similarity index 100%
rename from lib/FCM/Context/Keyword.pm
rename to usr/lib/FCM/Context/Keyword.pm
diff --git a/lib/FCM/Context/Locator.pm b/usr/lib/FCM/Context/Locator.pm
similarity index 100%
rename from lib/FCM/Context/Locator.pm
rename to usr/lib/FCM/Context/Locator.pm
diff --git a/lib/FCM/Context/Make.pm b/usr/lib/FCM/Context/Make.pm
similarity index 97%
rename from lib/FCM/Context/Make.pm
rename to usr/lib/FCM/Context/Make.pm
index 0c43b93..7865927 100644
--- a/lib/FCM/Context/Make.pm
+++ b/usr/lib/FCM/Context/Make.pm
@@ -32,6 +32,7 @@ use constant {
 
 __PACKAGE__->class({
     ctx_of            => '%',
+    description       => '$',
     dest              => '$',
     dest_lock         => '$',
     error             => {},
@@ -74,6 +75,10 @@ attributes:
 
 A HASH containing the (keys) IDs and the (values) context objects of the make.
 
+=item description
+
+A description string for this make.
+
 =item dest
 
 The destination of this make.
diff --git a/lib/FCM/Context/Make/Build.pm b/usr/lib/FCM/Context/Make/Build.pm
similarity index 100%
rename from lib/FCM/Context/Make/Build.pm
rename to usr/lib/FCM/Context/Make/Build.pm
diff --git a/lib/FCM/Context/Make/Extract.pm b/usr/lib/FCM/Context/Make/Extract.pm
similarity index 100%
rename from lib/FCM/Context/Make/Extract.pm
rename to usr/lib/FCM/Context/Make/Extract.pm
diff --git a/lib/FCM/Context/Make/Mirror.pm b/usr/lib/FCM/Context/Make/Mirror.pm
similarity index 100%
rename from lib/FCM/Context/Make/Mirror.pm
rename to usr/lib/FCM/Context/Make/Mirror.pm
diff --git a/lib/FCM/Context/Make/Share/Property.pm b/usr/lib/FCM/Context/Make/Share/Property.pm
similarity index 100%
rename from lib/FCM/Context/Make/Share/Property.pm
rename to usr/lib/FCM/Context/Make/Share/Property.pm
diff --git a/lib/FCM/Context/Task.pm b/usr/lib/FCM/Context/Task.pm
similarity index 100%
rename from lib/FCM/Context/Task.pm
rename to usr/lib/FCM/Context/Task.pm
diff --git a/lib/FCM/Exception.pm b/usr/lib/FCM/Exception.pm
similarity index 100%
rename from lib/FCM/Exception.pm
rename to usr/lib/FCM/Exception.pm
diff --git a/lib/FCM/System.pm b/usr/lib/FCM/System.pm
similarity index 100%
rename from lib/FCM/System.pm
rename to usr/lib/FCM/System.pm
diff --git a/lib/FCM/System/CM.pm b/usr/lib/FCM/System/CM.pm
similarity index 100%
rename from lib/FCM/System/CM.pm
rename to usr/lib/FCM/System/CM.pm
diff --git a/lib/FCM/System/CM/CommitMessage.pm b/usr/lib/FCM/System/CM/CommitMessage.pm
similarity index 100%
rename from lib/FCM/System/CM/CommitMessage.pm
rename to usr/lib/FCM/System/CM/CommitMessage.pm
diff --git a/lib/FCM/System/CM/Prompt.pm b/usr/lib/FCM/System/CM/Prompt.pm
similarity index 100%
rename from lib/FCM/System/CM/Prompt.pm
rename to usr/lib/FCM/System/CM/Prompt.pm
diff --git a/lib/FCM/System/CM/ResolveConflicts.pm b/usr/lib/FCM/System/CM/ResolveConflicts.pm
similarity index 100%
rename from lib/FCM/System/CM/ResolveConflicts.pm
rename to usr/lib/FCM/System/CM/ResolveConflicts.pm
diff --git a/lib/FCM/System/CM/SVN.pm b/usr/lib/FCM/System/CM/SVN.pm
similarity index 100%
rename from lib/FCM/System/CM/SVN.pm
rename to usr/lib/FCM/System/CM/SVN.pm
diff --git a/lib/FCM/System/Exception.pm b/usr/lib/FCM/System/Exception.pm
similarity index 100%
rename from lib/FCM/System/Exception.pm
rename to usr/lib/FCM/System/Exception.pm
diff --git a/lib/FCM/System/Make.pm b/usr/lib/FCM/System/Make.pm
similarity index 100%
rename from lib/FCM/System/Make.pm
rename to usr/lib/FCM/System/Make.pm
diff --git a/lib/FCM/System/Make/Build.pm b/usr/lib/FCM/System/Make/Build.pm
similarity index 100%
rename from lib/FCM/System/Make/Build.pm
rename to usr/lib/FCM/System/Make/Build.pm
diff --git a/lib/FCM/System/Make/Build/FileType.pm b/usr/lib/FCM/System/Make/Build/FileType.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType.pm
rename to usr/lib/FCM/System/Make/Build/FileType.pm
diff --git a/lib/FCM/System/Make/Build/FileType/C.pm b/usr/lib/FCM/System/Make/Build/FileType/C.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/C.pm
rename to usr/lib/FCM/System/Make/Build/FileType/C.pm
diff --git a/lib/FCM/System/Make/Build/FileType/CPP.pm b/usr/lib/FCM/System/Make/Build/FileType/CPP.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/CPP.pm
rename to usr/lib/FCM/System/Make/Build/FileType/CPP.pm
diff --git a/lib/FCM/System/Make/Build/FileType/CXX.pm b/usr/lib/FCM/System/Make/Build/FileType/CXX.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/CXX.pm
rename to usr/lib/FCM/System/Make/Build/FileType/CXX.pm
diff --git a/lib/FCM/System/Make/Build/FileType/Data.pm b/usr/lib/FCM/System/Make/Build/FileType/Data.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/Data.pm
rename to usr/lib/FCM/System/Make/Build/FileType/Data.pm
diff --git a/lib/FCM/System/Make/Build/FileType/FPP.pm b/usr/lib/FCM/System/Make/Build/FileType/FPP.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/FPP.pm
rename to usr/lib/FCM/System/Make/Build/FileType/FPP.pm
diff --git a/lib/FCM/System/Make/Build/FileType/Fortran.pm b/usr/lib/FCM/System/Make/Build/FileType/Fortran.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/Fortran.pm
rename to usr/lib/FCM/System/Make/Build/FileType/Fortran.pm
diff --git a/lib/FCM/System/Make/Build/FileType/H.pm b/usr/lib/FCM/System/Make/Build/FileType/H.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/H.pm
rename to usr/lib/FCM/System/Make/Build/FileType/H.pm
diff --git a/lib/FCM/System/Make/Build/FileType/NS.pm b/usr/lib/FCM/System/Make/Build/FileType/NS.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/NS.pm
rename to usr/lib/FCM/System/Make/Build/FileType/NS.pm
diff --git a/lib/FCM/System/Make/Build/FileType/Script.pm b/usr/lib/FCM/System/Make/Build/FileType/Script.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/FileType/Script.pm
rename to usr/lib/FCM/System/Make/Build/FileType/Script.pm
diff --git a/lib/FCM/System/Make/Build/Task/Archive.pm b/usr/lib/FCM/System/Make/Build/Task/Archive.pm
similarity index 92%
rename from lib/FCM/System/Make/Build/Task/Archive.pm
rename to usr/lib/FCM/System/Make/Build/Task/Archive.pm
index 167e9a8..a777b2e 100644
--- a/lib/FCM/System/Make/Build/Task/Archive.pm
+++ b/usr/lib/FCM/System/Make/Build/Task/Archive.pm
@@ -75,17 +75,17 @@ __END__
 
 =head1 NAME
 
-FCM::System::Make::Build::Task::Link
+FCM::System::Make::Build::Task::Archive
 
 =head1 SYNOPSIS
 
-    use FCM::System::Make::Build::Task::Link;
-    my $build_task = FCM::System::Make::Build::Task::Link->new(\%attrib);
+    use FCM::System::Make::Build::Task::Archive;
+    my $build_task = FCM::System::Make::Build::Task::Archive->new(\%attrib);
     $build_task->main($target);
 
 =head1 DESCRIPTION
 
-Invokes the linker to create the target executable.
+Invokes the archive to create the target archive library.
 
 =head1 METHODS
 
@@ -122,7 +122,7 @@ default values.
 
 =head1 CONSTANTS
 
-=item %FCM::System::Make::Build::Task::Link::PROP_OF
+=item %FCM::System::Make::Build::Task::Archive::PROP_OF
 
 A map containing the property names and their default values.
 
diff --git a/lib/FCM/System/Make/Build/Task/Compile.pm b/usr/lib/FCM/System/Make/Build/Task/Compile.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Compile.pm
rename to usr/lib/FCM/System/Make/Build/Task/Compile.pm
diff --git a/lib/FCM/System/Make/Build/Task/Compile/C.pm b/usr/lib/FCM/System/Make/Build/Task/Compile/C.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Compile/C.pm
rename to usr/lib/FCM/System/Make/Build/Task/Compile/C.pm
diff --git a/lib/FCM/System/Make/Build/Task/Compile/CXX.pm b/usr/lib/FCM/System/Make/Build/Task/Compile/CXX.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Compile/CXX.pm
rename to usr/lib/FCM/System/Make/Build/Task/Compile/CXX.pm
diff --git a/lib/FCM/System/Make/Build/Task/Compile/Fortran.pm b/usr/lib/FCM/System/Make/Build/Task/Compile/Fortran.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Compile/Fortran.pm
rename to usr/lib/FCM/System/Make/Build/Task/Compile/Fortran.pm
diff --git a/lib/FCM/System/Make/Build/Task/ExtractInterface.pm b/usr/lib/FCM/System/Make/Build/Task/ExtractInterface.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/ExtractInterface.pm
rename to usr/lib/FCM/System/Make/Build/Task/ExtractInterface.pm
diff --git a/lib/FCM/System/Make/Build/Task/Install.pm b/usr/lib/FCM/System/Make/Build/Task/Install.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Install.pm
rename to usr/lib/FCM/System/Make/Build/Task/Install.pm
diff --git a/lib/FCM/System/Make/Build/Task/Link.pm b/usr/lib/FCM/System/Make/Build/Task/Link.pm
similarity index 70%
rename from lib/FCM/System/Make/Build/Task/Link.pm
rename to usr/lib/FCM/System/Make/Build/Task/Link.pm
index 53fe066..f645e81 100644
--- a/lib/FCM/System/Make/Build/Task/Link.pm
+++ b/usr/lib/FCM/System/Make/Build/Task/Link.pm
@@ -65,66 +65,35 @@ sub _main {
         }
     }
     my $path_of_main_o = shift(@{$paths_of{o}});
-    my $keep_lib_o = $P->('keep-lib-o');
-    my $lib_o_dir;
-    if ($keep_lib_o) {
-        $lib_o_dir = $target->CT_LIB;
-        mkpath($lib_o_dir);
-    }
-    else {
-        $lib_o_dir = tempdir(CLEANUP => 1);
-    }
     my ($extension, $root)
         = $attrib_ref->{util}->file_ext(basename($target->get_key()));
-    my $lib_o = catfile($lib_o_dir, "lib$root.a");
     my %opt_of = (
         o => $P->($NAME . '.flag-output'),
         L => $P->($NAME . '.flag-lib-path'),
         l => $P->($NAME . '.flag-lib'),
     );
-    for my $command_list_ref (
-        # Archive (when linking multiple objects)
-        (   @{$paths_of{o}}
-            ?   [   shellwords($P->('ar')),
-                    shellwords($P->('ar.flags')),
-                    $lib_o,
-                    @{$paths_of{o}},
-                ]
-            :   ()
-        ),
-        # Link
-        [   ($P->('ld') ? shellwords($P->('ld')) : shellwords($P->($NAME))),
-            _props_to_opts($opt_of{o}, $abs2rel_func->($target->get_path())),
-            $path_of_main_o,
-            @{$paths_of{'o.special'}},
-            (   @{$paths_of{o}}
-                ?   (   _props_to_opts($opt_of{L}, $lib_o_dir),
-                        _props_to_opts($opt_of{l}, $root),
-                    )
-                :   ()
-            ),
-            _props_to_opts($opt_of{L}, shellwords($P->($NAME .  '.lib-paths'))),
-            _props_to_opts($opt_of{l}, shellwords($P->($NAME .  '.libs'))),
-            shellwords($P->($NAME . '.flag-omp')),
-            shellwords($P->($NAME . '.flags-ld')),
-        ],
-    ) {
-        my %value_of = %{$attrib_ref->{util}->shell_simple($command_list_ref)};
-        if ($value_of{rc}) {
-            return $E->throw(
-                $E->SHELL,
-                {command_list => $command_list_ref, %value_of},
-                $value_of{e},
-            );
-        }
-        $attrib_ref->{util}->event(
-            FCM::Context::Event->MAKE_BUILD_SHELL_OUT, @value_of{qw{o e}},
+    my @command_list = (
+        ($P->('ld') ? shellwords($P->('ld')) : shellwords($P->($NAME))),
+        _props_to_opts($opt_of{o}, $abs2rel_func->($target->get_path())),
+        $path_of_main_o,
+        @{$paths_of{'o.special'}},
+        @{$paths_of{o}},
+        _props_to_opts($opt_of{L}, shellwords($P->($NAME .  '.lib-paths'))),
+        _props_to_opts($opt_of{l}, shellwords($P->($NAME .  '.libs'))),
+        shellwords($P->($NAME . '.flag-omp')),
+        shellwords($P->($NAME . '.flags-ld')),
+    );
+    my %value_of = %{$attrib_ref->{util}->shell_simple(\@command_list)};
+    if ($value_of{rc}) {
+        return $E->throw(
+            $E->SHELL,
+            {command_list => \@command_list, %value_of},
+            $value_of{e},
         );
     }
-    if (!$keep_lib_o) {
-        unlink($lib_o);
-        rmtree($lib_o_dir);
-    }
+    $attrib_ref->{util}->event(
+        FCM::Context::Event->MAKE_BUILD_SHELL_OUT, @value_of{qw{o e}},
+    );
     $target;
 }
 
diff --git a/lib/FCM/System/Make/Build/Task/Link/C.pm b/usr/lib/FCM/System/Make/Build/Task/Link/C.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Link/C.pm
rename to usr/lib/FCM/System/Make/Build/Task/Link/C.pm
diff --git a/lib/FCM/System/Make/Build/Task/Link/CXX.pm b/usr/lib/FCM/System/Make/Build/Task/Link/CXX.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Link/CXX.pm
rename to usr/lib/FCM/System/Make/Build/Task/Link/CXX.pm
diff --git a/lib/FCM/System/Make/Build/Task/Link/Fortran.pm b/usr/lib/FCM/System/Make/Build/Task/Link/Fortran.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Link/Fortran.pm
rename to usr/lib/FCM/System/Make/Build/Task/Link/Fortran.pm
diff --git a/lib/FCM/System/Make/Build/Task/Preprocess.pm b/usr/lib/FCM/System/Make/Build/Task/Preprocess.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Preprocess.pm
rename to usr/lib/FCM/System/Make/Build/Task/Preprocess.pm
diff --git a/lib/FCM/System/Make/Build/Task/Preprocess/C.pm b/usr/lib/FCM/System/Make/Build/Task/Preprocess/C.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Preprocess/C.pm
rename to usr/lib/FCM/System/Make/Build/Task/Preprocess/C.pm
diff --git a/lib/FCM/System/Make/Build/Task/Preprocess/Fortran.pm b/usr/lib/FCM/System/Make/Build/Task/Preprocess/Fortran.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Preprocess/Fortran.pm
rename to usr/lib/FCM/System/Make/Build/Task/Preprocess/Fortran.pm
diff --git a/lib/FCM/System/Make/Build/Task/Share.pm b/usr/lib/FCM/System/Make/Build/Task/Share.pm
similarity index 100%
rename from lib/FCM/System/Make/Build/Task/Share.pm
rename to usr/lib/FCM/System/Make/Build/Task/Share.pm
diff --git a/lib/FCM/System/Make/Extract.pm b/usr/lib/FCM/System/Make/Extract.pm
similarity index 100%
rename from lib/FCM/System/Make/Extract.pm
rename to usr/lib/FCM/System/Make/Extract.pm
diff --git a/lib/FCM/System/Make/Mirror.pm b/usr/lib/FCM/System/Make/Mirror.pm
similarity index 100%
rename from lib/FCM/System/Make/Mirror.pm
rename to usr/lib/FCM/System/Make/Mirror.pm
diff --git a/lib/FCM/System/Make/Preprocess.pm b/usr/lib/FCM/System/Make/Preprocess.pm
similarity index 100%
rename from lib/FCM/System/Make/Preprocess.pm
rename to usr/lib/FCM/System/Make/Preprocess.pm
diff --git a/lib/FCM/System/Make/Share/Config.pm b/usr/lib/FCM/System/Make/Share/Config.pm
similarity index 96%
rename from lib/FCM/System/Make/Share/Config.pm
rename to usr/lib/FCM/System/Make/Share/Config.pm
index 183ab80..64bf806 100644
--- a/lib/FCM/System/Make/Share/Config.pm
+++ b/usr/lib/FCM/System/Make/Share/Config.pm
@@ -37,6 +37,7 @@ my $E = 'FCM::System::Exception';
 
 # Configuration parser label to action map
 my %CONFIG_PARSER_OF = (
+    'description'     => \&_parse_description,
     'dest'            => \&_parse_dest,
     'name'            => \&_parse_name,
     'require-version' => \&_parse_require_version,
@@ -207,6 +208,12 @@ sub _get_config_reader {
     );
 }
 
+# Reads the "description" declaration from a config entry.
+sub _parse_description {
+    my ($attrib_ref, $m_ctx, $entry) = @_;
+    $m_ctx->set_description($entry->get_value());
+}
+
 # Reads the "dest" declaration from a config entry.
 sub _parse_dest {
     my ($attrib_ref, $m_ctx, $entry) = @_;
@@ -324,10 +331,11 @@ sub _unparse {
                         : ()
                     ;
                 }
-            (   [sub {$m_ctx->get_name()}, 'name' ],
-                [\&_unparse_use          , 'use'  ],
-                [\&_unparse_steps        , 'steps'],
-                [sub {$m_ctx->get_dest()}, 'dest' ],
+            (   [sub {$m_ctx->get_name()}       , 'name'        ],
+                [\&_unparse_use                 , 'use'         ],
+                [\&_unparse_steps               , 'steps'       ],
+                [sub {$m_ctx->get_dest()}       , 'dest'        ],
+                [sub {$m_ctx->get_description()}, 'description' ],
             ),
         ),
         (   map {   my $id = $_;
diff --git a/lib/FCM/System/Make/Share/Dest.pm b/usr/lib/FCM/System/Make/Share/Dest.pm
similarity index 100%
rename from lib/FCM/System/Make/Share/Dest.pm
rename to usr/lib/FCM/System/Make/Share/Dest.pm
diff --git a/lib/FCM/System/Make/Share/Subsystem.pm b/usr/lib/FCM/System/Make/Share/Subsystem.pm
similarity index 100%
rename from lib/FCM/System/Make/Share/Subsystem.pm
rename to usr/lib/FCM/System/Make/Share/Subsystem.pm
diff --git a/lib/FCM/System/Misc.pm b/usr/lib/FCM/System/Misc.pm
similarity index 100%
rename from lib/FCM/System/Misc.pm
rename to usr/lib/FCM/System/Misc.pm
diff --git a/lib/FCM/System/Old.pm b/usr/lib/FCM/System/Old.pm
similarity index 100%
rename from lib/FCM/System/Old.pm
rename to usr/lib/FCM/System/Old.pm
diff --git a/lib/FCM/Util.pm b/usr/lib/FCM/Util.pm
similarity index 100%
rename from lib/FCM/Util.pm
rename to usr/lib/FCM/Util.pm
diff --git a/lib/FCM/Util/ConfigReader.pm b/usr/lib/FCM/Util/ConfigReader.pm
similarity index 100%
rename from lib/FCM/Util/ConfigReader.pm
rename to usr/lib/FCM/Util/ConfigReader.pm
diff --git a/lib/FCM/Util/ConfigUpgrade.pm b/usr/lib/FCM/Util/ConfigUpgrade.pm
similarity index 100%
rename from lib/FCM/Util/ConfigUpgrade.pm
rename to usr/lib/FCM/Util/ConfigUpgrade.pm
diff --git a/lib/FCM/Util/Event.pm b/usr/lib/FCM/Util/Event.pm
similarity index 99%
rename from lib/FCM/Util/Event.pm
rename to usr/lib/FCM/Util/Event.pm
index 1dedc21..4b20b5e 100644
--- a/lib/FCM/Util/Event.pm
+++ b/usr/lib/FCM/Util/Event.pm
@@ -321,6 +321,7 @@ our %S = (
                                     . ' total-time=%.1fs',
     make_build_targets_fail_0    => '! %-20s: depends on failed target: %s',
     make_build_targets_fail_1    => '! %-20s: update task failed',
+    make_description             => 'description=%s',
     make_dest                    => 'dest=%s',
     make_dest_use                => 'use=%s',
     make_extract_project_tree    => 'location %5s:%2d: %s%s',
@@ -891,6 +892,9 @@ sub _event_make_build_shell_out {
 # Notification when a make destination is being set up.
 sub _event_make_dest {
     my ($m_ctx, $authority) = @_;
+    if ($m_ctx->get_description()) {
+        $R->report(sprintf($S{make_description}, $m_ctx->get_description()));
+    }
     $R->report(sprintf($S{make_dest}, $authority . ':' . $m_ctx->get_dest()));
     $R->report(sprintf(
         $S{make_mode},
diff --git a/lib/FCM/Util/Exception.pm b/usr/lib/FCM/Util/Exception.pm
similarity index 100%
rename from lib/FCM/Util/Exception.pm
rename to usr/lib/FCM/Util/Exception.pm
diff --git a/lib/FCM/Util/Locator.pm b/usr/lib/FCM/Util/Locator.pm
similarity index 100%
rename from lib/FCM/Util/Locator.pm
rename to usr/lib/FCM/Util/Locator.pm
diff --git a/lib/FCM/Util/Locator/FS.pm b/usr/lib/FCM/Util/Locator/FS.pm
similarity index 100%
rename from lib/FCM/Util/Locator/FS.pm
rename to usr/lib/FCM/Util/Locator/FS.pm
diff --git a/lib/FCM/Util/Locator/SSH.pm b/usr/lib/FCM/Util/Locator/SSH.pm
similarity index 100%
rename from lib/FCM/Util/Locator/SSH.pm
rename to usr/lib/FCM/Util/Locator/SSH.pm
diff --git a/lib/FCM/Util/Locator/SVN.pm b/usr/lib/FCM/Util/Locator/SVN.pm
similarity index 100%
rename from lib/FCM/Util/Locator/SVN.pm
rename to usr/lib/FCM/Util/Locator/SVN.pm
diff --git a/lib/FCM/Util/Reporter.pm b/usr/lib/FCM/Util/Reporter.pm
similarity index 100%
rename from lib/FCM/Util/Reporter.pm
rename to usr/lib/FCM/Util/Reporter.pm
diff --git a/lib/FCM/Util/Shell.pm b/usr/lib/FCM/Util/Shell.pm
similarity index 100%
rename from lib/FCM/Util/Shell.pm
rename to usr/lib/FCM/Util/Shell.pm
diff --git a/lib/FCM/Util/TaskRunner.pm b/usr/lib/FCM/Util/TaskRunner.pm
similarity index 100%
rename from lib/FCM/Util/TaskRunner.pm
rename to usr/lib/FCM/Util/TaskRunner.pm
diff --git a/lib/FCM1/Base.pm b/usr/lib/FCM1/Base.pm
similarity index 100%
rename from lib/FCM1/Base.pm
rename to usr/lib/FCM1/Base.pm
diff --git a/lib/FCM1/Build.pm b/usr/lib/FCM1/Build.pm
similarity index 100%
rename from lib/FCM1/Build.pm
rename to usr/lib/FCM1/Build.pm
diff --git a/lib/FCM1/Build/Fortran.pm b/usr/lib/FCM1/Build/Fortran.pm
similarity index 100%
rename from lib/FCM1/Build/Fortran.pm
rename to usr/lib/FCM1/Build/Fortran.pm
diff --git a/lib/FCM1/BuildSrc.pm b/usr/lib/FCM1/BuildSrc.pm
similarity index 100%
rename from lib/FCM1/BuildSrc.pm
rename to usr/lib/FCM1/BuildSrc.pm
diff --git a/lib/FCM1/BuildTask.pm b/usr/lib/FCM1/BuildTask.pm
similarity index 100%
rename from lib/FCM1/BuildTask.pm
rename to usr/lib/FCM1/BuildTask.pm
diff --git a/lib/FCM1/CfgFile.pm b/usr/lib/FCM1/CfgFile.pm
similarity index 100%
rename from lib/FCM1/CfgFile.pm
rename to usr/lib/FCM1/CfgFile.pm
diff --git a/lib/FCM1/CfgLine.pm b/usr/lib/FCM1/CfgLine.pm
similarity index 100%
rename from lib/FCM1/CfgLine.pm
rename to usr/lib/FCM1/CfgLine.pm
diff --git a/lib/FCM1/Cm.pm b/usr/lib/FCM1/Cm.pm
similarity index 100%
rename from lib/FCM1/Cm.pm
rename to usr/lib/FCM1/Cm.pm
diff --git a/lib/FCM1/CmBranch.pm b/usr/lib/FCM1/CmBranch.pm
similarity index 100%
rename from lib/FCM1/CmBranch.pm
rename to usr/lib/FCM1/CmBranch.pm
diff --git a/lib/FCM1/CmUrl.pm b/usr/lib/FCM1/CmUrl.pm
similarity index 100%
rename from lib/FCM1/CmUrl.pm
rename to usr/lib/FCM1/CmUrl.pm
diff --git a/lib/FCM1/Config.pm b/usr/lib/FCM1/Config.pm
similarity index 100%
rename from lib/FCM1/Config.pm
rename to usr/lib/FCM1/Config.pm
diff --git a/lib/FCM1/ConfigSystem.pm b/usr/lib/FCM1/ConfigSystem.pm
similarity index 100%
rename from lib/FCM1/ConfigSystem.pm
rename to usr/lib/FCM1/ConfigSystem.pm
diff --git a/lib/FCM1/Dest.pm b/usr/lib/FCM1/Dest.pm
similarity index 100%
rename from lib/FCM1/Dest.pm
rename to usr/lib/FCM1/Dest.pm
diff --git a/lib/FCM1/Exception.pm b/usr/lib/FCM1/Exception.pm
similarity index 100%
rename from lib/FCM1/Exception.pm
rename to usr/lib/FCM1/Exception.pm
diff --git a/lib/FCM1/Extract.pm b/usr/lib/FCM1/Extract.pm
similarity index 100%
rename from lib/FCM1/Extract.pm
rename to usr/lib/FCM1/Extract.pm
diff --git a/lib/FCM1/ExtractConfigComparator.pm b/usr/lib/FCM1/ExtractConfigComparator.pm
similarity index 100%
rename from lib/FCM1/ExtractConfigComparator.pm
rename to usr/lib/FCM1/ExtractConfigComparator.pm
diff --git a/lib/FCM1/ExtractFile.pm b/usr/lib/FCM1/ExtractFile.pm
similarity index 100%
rename from lib/FCM1/ExtractFile.pm
rename to usr/lib/FCM1/ExtractFile.pm
diff --git a/lib/FCM1/ExtractSrc.pm b/usr/lib/FCM1/ExtractSrc.pm
similarity index 100%
rename from lib/FCM1/ExtractSrc.pm
rename to usr/lib/FCM1/ExtractSrc.pm
diff --git a/lib/FCM1/Interactive.pm b/usr/lib/FCM1/Interactive.pm
similarity index 100%
rename from lib/FCM1/Interactive.pm
rename to usr/lib/FCM1/Interactive.pm
diff --git a/lib/FCM1/Interactive/InputGetter.pm b/usr/lib/FCM1/Interactive/InputGetter.pm
similarity index 100%
rename from lib/FCM1/Interactive/InputGetter.pm
rename to usr/lib/FCM1/Interactive/InputGetter.pm
diff --git a/lib/FCM1/Interactive/InputGetter/CLI.pm b/usr/lib/FCM1/Interactive/InputGetter/CLI.pm
similarity index 100%
rename from lib/FCM1/Interactive/InputGetter/CLI.pm
rename to usr/lib/FCM1/Interactive/InputGetter/CLI.pm
diff --git a/lib/FCM1/Interactive/InputGetter/GUI.pm b/usr/lib/FCM1/Interactive/InputGetter/GUI.pm
similarity index 100%
rename from lib/FCM1/Interactive/InputGetter/GUI.pm
rename to usr/lib/FCM1/Interactive/InputGetter/GUI.pm
diff --git a/lib/FCM1/Keyword.pm b/usr/lib/FCM1/Keyword.pm
similarity index 100%
rename from lib/FCM1/Keyword.pm
rename to usr/lib/FCM1/Keyword.pm
diff --git a/lib/FCM1/ReposBranch.pm b/usr/lib/FCM1/ReposBranch.pm
similarity index 100%
rename from lib/FCM1/ReposBranch.pm
rename to usr/lib/FCM1/ReposBranch.pm
diff --git a/lib/FCM1/SrcDirLayer.pm b/usr/lib/FCM1/SrcDirLayer.pm
similarity index 100%
rename from lib/FCM1/SrcDirLayer.pm
rename to usr/lib/FCM1/SrcDirLayer.pm
diff --git a/lib/FCM1/Timer.pm b/usr/lib/FCM1/Timer.pm
similarity index 100%
rename from lib/FCM1/Timer.pm
rename to usr/lib/FCM1/Timer.pm
diff --git a/lib/FCM1/Util.pm b/usr/lib/FCM1/Util.pm
similarity index 100%
rename from lib/FCM1/Util.pm
rename to usr/lib/FCM1/Util.pm
diff --git a/lib/FCM1/Util/ClassLoader.pm b/usr/lib/FCM1/Util/ClassLoader.pm
similarity index 100%
rename from lib/FCM1/Util/ClassLoader.pm
rename to usr/lib/FCM1/Util/ClassLoader.pm
diff --git a/licences/Apache2 b/usr/licences/Apache2
similarity index 100%
rename from licences/Apache2
rename to usr/licences/Apache2
diff --git a/licences/GPL3 b/usr/licences/GPL3
similarity index 100%
rename from licences/GPL3
rename to usr/licences/GPL3
diff --git a/licences/MIT b/usr/licences/MIT
similarity index 100%
rename from licences/MIT
rename to usr/licences/MIT
diff --git a/man/man1/fcm.1 b/usr/man/man1/fcm.1
similarity index 100%
rename from man/man1/fcm.1
rename to usr/man/man1/fcm.1
diff --git a/sbin/fcm-add-svn-repos b/usr/sbin/fcm-add-svn-repos
similarity index 100%
rename from sbin/fcm-add-svn-repos
rename to usr/sbin/fcm-add-svn-repos
diff --git a/sbin/fcm-add-svn-repos-and-trac-env b/usr/sbin/fcm-add-svn-repos-and-trac-env
similarity index 100%
rename from sbin/fcm-add-svn-repos-and-trac-env
rename to usr/sbin/fcm-add-svn-repos-and-trac-env
diff --git a/sbin/fcm-add-trac-env b/usr/sbin/fcm-add-trac-env
similarity index 100%
rename from sbin/fcm-add-trac-env
rename to usr/sbin/fcm-add-trac-env
diff --git a/sbin/fcm-backup-svn-repos b/usr/sbin/fcm-backup-svn-repos
similarity index 100%
rename from sbin/fcm-backup-svn-repos
rename to usr/sbin/fcm-backup-svn-repos
diff --git a/sbin/fcm-backup-trac-env b/usr/sbin/fcm-backup-trac-env
similarity index 100%
rename from sbin/fcm-backup-trac-env
rename to usr/sbin/fcm-backup-trac-env
diff --git a/sbin/fcm-commit-update b/usr/sbin/fcm-commit-update
similarity index 100%
rename from sbin/fcm-commit-update
rename to usr/sbin/fcm-commit-update
diff --git a/sbin/fcm-daily-update b/usr/sbin/fcm-daily-update
similarity index 100%
rename from sbin/fcm-daily-update
rename to usr/sbin/fcm-daily-update
diff --git a/sbin/fcm-install-svn-hook b/usr/sbin/fcm-install-svn-hook
similarity index 100%
rename from sbin/fcm-install-svn-hook
rename to usr/sbin/fcm-install-svn-hook
diff --git a/sbin/fcm-manage-trac-env-session b/usr/sbin/fcm-manage-trac-env-session
similarity index 100%
rename from sbin/fcm-manage-trac-env-session
rename to usr/sbin/fcm-manage-trac-env-session
diff --git a/sbin/fcm-manage-users b/usr/sbin/fcm-manage-users
similarity index 100%
rename from sbin/fcm-manage-users
rename to usr/sbin/fcm-manage-users
diff --git a/sbin/fcm-recover-svn-repos b/usr/sbin/fcm-recover-svn-repos
similarity index 100%
rename from sbin/fcm-recover-svn-repos
rename to usr/sbin/fcm-recover-svn-repos
diff --git a/sbin/fcm-recover-trac-env b/usr/sbin/fcm-recover-trac-env
similarity index 100%
rename from sbin/fcm-recover-trac-env
rename to usr/sbin/fcm-recover-trac-env
diff --git a/sbin/fcm-rpmbuild b/usr/sbin/fcm-rpmbuild
similarity index 100%
rename from sbin/fcm-rpmbuild
rename to usr/sbin/fcm-rpmbuild
diff --git a/sbin/fcm-user-to-email b/usr/sbin/fcm-user-to-email
similarity index 100%
rename from sbin/fcm-user-to-email
rename to usr/sbin/fcm-user-to-email
diff --git a/sbin/fcm-vacuum-trac-env-db b/usr/sbin/fcm-vacuum-trac-env-db
similarity index 100%
rename from sbin/fcm-vacuum-trac-env-db
rename to usr/sbin/fcm-vacuum-trac-env-db
diff --git a/sbin/my-regular-update.example b/usr/sbin/my-regular-update.example
similarity index 100%
rename from sbin/my-regular-update.example
rename to usr/sbin/my-regular-update.example
diff --git a/sbin/post-commit-bg b/usr/sbin/post-commit-bg
similarity index 100%
rename from sbin/post-commit-bg
rename to usr/sbin/post-commit-bg
diff --git a/sbin/post-commit-bg-notify-who b/usr/sbin/post-commit-bg-notify-who
similarity index 100%
rename from sbin/post-commit-bg-notify-who
rename to usr/sbin/post-commit-bg-notify-who
diff --git a/sbin/post-revprop-change-bg b/usr/sbin/post-revprop-change-bg
similarity index 100%
rename from sbin/post-revprop-change-bg
rename to usr/sbin/post-revprop-change-bg
diff --git a/sbin/pre-commit b/usr/sbin/pre-commit
similarity index 100%
rename from sbin/pre-commit
rename to usr/sbin/pre-commit
diff --git a/sbin/pre-commit-verify-branch-owner b/usr/sbin/pre-commit-verify-branch-owner
similarity index 100%
rename from sbin/pre-commit-verify-branch-owner
rename to usr/sbin/pre-commit-verify-branch-owner
diff --git a/sbin/pre-revprop-change b/usr/sbin/pre-revprop-change
similarity index 100%
rename from sbin/pre-revprop-change
rename to usr/sbin/pre-revprop-change
diff --git a/sbin/svnperms.py b/usr/sbin/svnperms.py
similarity index 100%
rename from sbin/svnperms.py
rename to usr/sbin/svnperms.py
diff --git a/sbin/trac_hook b/usr/sbin/trac_hook
similarity index 100%
rename from sbin/trac_hook
rename to usr/sbin/trac_hook
diff --git a/t/etc/repo_files/lib/python/info/__init__.py b/usr/t/etc/repo_files/lib/python/info/__init__.py
similarity index 100%
rename from t/etc/repo_files/lib/python/info/__init__.py
rename to usr/t/etc/repo_files/lib/python/info/__init__.py
diff --git a/t/etc/repo_files/lib/python/info/poems.py b/usr/t/etc/repo_files/lib/python/info/poems.py
similarity index 100%
rename from t/etc/repo_files/lib/python/info/poems.py
rename to usr/t/etc/repo_files/lib/python/info/poems.py
diff --git a/t/etc/repo_files/module/hello_constants.f90 b/usr/t/etc/repo_files/module/hello_constants.f90
similarity index 100%
rename from t/etc/repo_files/module/hello_constants.f90
rename to usr/t/etc/repo_files/module/hello_constants.f90
diff --git a/t/etc/repo_files/module/hello_constants.inc b/usr/t/etc/repo_files/module/hello_constants.inc
similarity index 100%
rename from t/etc/repo_files/module/hello_constants.inc
rename to usr/t/etc/repo_files/module/hello_constants.inc
diff --git a/t/etc/repo_files/module/hello_constants_dummy.inc b/usr/t/etc/repo_files/module/hello_constants_dummy.inc
similarity index 100%
rename from t/etc/repo_files/module/hello_constants_dummy.inc
rename to usr/t/etc/repo_files/module/hello_constants_dummy.inc
diff --git a/t/etc/repo_files/pro/hello.pro b/usr/t/etc/repo_files/pro/hello.pro
similarity index 100%
rename from t/etc/repo_files/pro/hello.pro
rename to usr/t/etc/repo_files/pro/hello.pro
diff --git a/t/etc/repo_files/pro/plot.pro b/usr/t/etc/repo_files/pro/plot.pro
similarity index 100%
rename from t/etc/repo_files/pro/plot.pro
rename to usr/t/etc/repo_files/pro/plot.pro
diff --git a/t/etc/repo_files/program/hello.F90 b/usr/t/etc/repo_files/program/hello.F90
similarity index 100%
rename from t/etc/repo_files/program/hello.F90
rename to usr/t/etc/repo_files/program/hello.F90
diff --git a/t/etc/repo_files/subroutine/hello_c.c b/usr/t/etc/repo_files/subroutine/hello_c.c
similarity index 100%
rename from t/etc/repo_files/subroutine/hello_c.c
rename to usr/t/etc/repo_files/subroutine/hello_c.c
diff --git a/t/etc/repo_files/subroutine/hello_sub.F90 b/usr/t/etc/repo_files/subroutine/hello_sub.F90
similarity index 100%
rename from t/etc/repo_files/subroutine/hello_sub.F90
rename to usr/t/etc/repo_files/subroutine/hello_sub.F90
diff --git a/t/etc/repo_files/subroutine/hello_sub.h b/usr/t/etc/repo_files/subroutine/hello_sub.h
similarity index 100%
rename from t/etc/repo_files/subroutine/hello_sub.h
rename to usr/t/etc/repo_files/subroutine/hello_sub.h
diff --git a/t/etc/repo_files/subroutine/hello_sub_dummy.h b/usr/t/etc/repo_files/subroutine/hello_sub_dummy.h
similarity index 100%
rename from t/etc/repo_files/subroutine/hello_sub_dummy.h
rename to usr/t/etc/repo_files/subroutine/hello_sub_dummy.h
diff --git a/t/fcm-add-trac-env/00-basic.t b/usr/t/fcm-add-trac-env/00-basic.t
similarity index 100%
rename from t/fcm-add-trac-env/00-basic.t
rename to usr/t/fcm-add-trac-env/00-basic.t
diff --git a/t/fcm-add-trac-env/test_header b/usr/t/fcm-add-trac-env/test_header
similarity index 100%
rename from t/fcm-add-trac-env/test_header
rename to usr/t/fcm-add-trac-env/test_header
diff --git a/t/fcm-add/00-simple.t b/usr/t/fcm-add/00-simple.t
similarity index 100%
rename from t/fcm-add/00-simple.t
rename to usr/t/fcm-add/00-simple.t
diff --git a/t/fcm-add/test_header b/usr/t/fcm-add/test_header
similarity index 100%
rename from t/fcm-add/test_header
rename to usr/t/fcm-add/test_header
diff --git a/t/fcm-backup-svn-repos/00-basic.t b/usr/t/fcm-backup-svn-repos/00-basic.t
similarity index 100%
rename from t/fcm-backup-svn-repos/00-basic.t
rename to usr/t/fcm-backup-svn-repos/00-basic.t
diff --git a/t/fcm-backup-svn-repos/test_header b/usr/t/fcm-backup-svn-repos/test_header
similarity index 100%
rename from t/fcm-backup-svn-repos/test_header
rename to usr/t/fcm-backup-svn-repos/test_header
diff --git a/t/fcm-branch-create/00-simple.t b/usr/t/fcm-branch-create/00-simple.t
similarity index 100%
rename from t/fcm-branch-create/00-simple.t
rename to usr/t/fcm-branch-create/00-simple.t
diff --git a/t/fcm-branch-create/test_header b/usr/t/fcm-branch-create/test_header
similarity index 100%
rename from t/fcm-branch-create/test_header
rename to usr/t/fcm-branch-create/test_header
diff --git a/t/fcm-branch-delete/00-simple.t b/usr/t/fcm-branch-delete/00-simple.t
similarity index 100%
rename from t/fcm-branch-delete/00-simple.t
rename to usr/t/fcm-branch-delete/00-simple.t
diff --git a/t/fcm-branch-delete/01-bad-arg.t b/usr/t/fcm-branch-delete/01-bad-arg.t
similarity index 100%
rename from t/fcm-branch-delete/01-bad-arg.t
rename to usr/t/fcm-branch-delete/01-bad-arg.t
diff --git a/t/fcm-branch-delete/02-rosie.t b/usr/t/fcm-branch-delete/02-rosie.t
similarity index 100%
rename from t/fcm-branch-delete/02-rosie.t
rename to usr/t/fcm-branch-delete/02-rosie.t
diff --git a/t/fcm-branch-delete/test_header b/usr/t/fcm-branch-delete/test_header
similarity index 100%
rename from t/fcm-branch-delete/test_header
rename to usr/t/fcm-branch-delete/test_header
diff --git a/t/fcm-branch-diff/00-simple.t b/usr/t/fcm-branch-diff/00-simple.t
similarity index 100%
rename from t/fcm-branch-diff/00-simple.t
rename to usr/t/fcm-branch-diff/00-simple.t
diff --git a/t/fcm-branch-diff/test_header b/usr/t/fcm-branch-diff/test_header
similarity index 100%
rename from t/fcm-branch-diff/test_header
rename to usr/t/fcm-branch-diff/test_header
diff --git a/t/fcm-branch-info/00-simple.t b/usr/t/fcm-branch-info/00-simple.t
similarity index 100%
rename from t/fcm-branch-info/00-simple.t
rename to usr/t/fcm-branch-info/00-simple.t
diff --git a/t/fcm-branch-info/test_header b/usr/t/fcm-branch-info/test_header
similarity index 100%
rename from t/fcm-branch-info/test_header
rename to usr/t/fcm-branch-info/test_header
diff --git a/t/fcm-branch-list/00-simple.t b/usr/t/fcm-branch-list/00-simple.t
similarity index 100%
rename from t/fcm-branch-list/00-simple.t
rename to usr/t/fcm-branch-list/00-simple.t
diff --git a/t/fcm-branch-list/test_header b/usr/t/fcm-branch-list/test_header
similarity index 100%
rename from t/fcm-branch-list/test_header
rename to usr/t/fcm-branch-list/test_header
diff --git a/t/fcm-build/00-geninterface.t b/usr/t/fcm-build/00-geninterface.t
similarity index 100%
rename from t/fcm-build/00-geninterface.t
rename to usr/t/fcm-build/00-geninterface.t
diff --git a/t/fcm-build/test_header b/usr/t/fcm-build/test_header
similarity index 100%
rename from t/fcm-build/test_header
rename to usr/t/fcm-build/test_header
diff --git a/t/fcm-cfg-print/00-env.t b/usr/t/fcm-cfg-print/00-env.t
similarity index 100%
rename from t/fcm-cfg-print/00-env.t
rename to usr/t/fcm-cfg-print/00-env.t
diff --git a/t/fcm-cfg-print/test_header b/usr/t/fcm-cfg-print/test_header
similarity index 100%
rename from t/fcm-cfg-print/test_header
rename to usr/t/fcm-cfg-print/test_header
diff --git a/t/fcm-commit/00-simple.t b/usr/t/fcm-commit/00-simple.t
similarity index 100%
rename from t/fcm-commit/00-simple.t
rename to usr/t/fcm-commit/00-simple.t
diff --git a/t/fcm-commit/01-subtree.t b/usr/t/fcm-commit/01-subtree.t
similarity index 100%
rename from t/fcm-commit/01-subtree.t
rename to usr/t/fcm-commit/01-subtree.t
diff --git a/t/fcm-commit/02-bad.t b/usr/t/fcm-commit/02-bad.t
similarity index 100%
rename from t/fcm-commit/02-bad.t
rename to usr/t/fcm-commit/02-bad.t
diff --git a/t/fcm-commit/03-message-file.t b/usr/t/fcm-commit/03-message-file.t
similarity index 100%
rename from t/fcm-commit/03-message-file.t
rename to usr/t/fcm-commit/03-message-file.t
diff --git a/t/fcm-commit/04-externals.t b/usr/t/fcm-commit/04-externals.t
similarity index 100%
rename from t/fcm-commit/04-externals.t
rename to usr/t/fcm-commit/04-externals.t
diff --git a/t/fcm-commit/test_header b/usr/t/fcm-commit/test_header
similarity index 100%
rename from t/fcm-commit/test_header
rename to usr/t/fcm-commit/test_header
diff --git a/t/fcm-conflicts/00-tree-add-add.t b/usr/t/fcm-conflicts/00-tree-add-add.t
similarity index 100%
rename from t/fcm-conflicts/00-tree-add-add.t
rename to usr/t/fcm-conflicts/00-tree-add-add.t
diff --git a/t/fcm-conflicts/01-tree-delete-delete.t b/usr/t/fcm-conflicts/01-tree-delete-delete.t
similarity index 100%
rename from t/fcm-conflicts/01-tree-delete-delete.t
rename to usr/t/fcm-conflicts/01-tree-delete-delete.t
diff --git a/t/fcm-conflicts/02-tree-delete-edit.t b/usr/t/fcm-conflicts/02-tree-delete-edit.t
similarity index 100%
rename from t/fcm-conflicts/02-tree-delete-edit.t
rename to usr/t/fcm-conflicts/02-tree-delete-edit.t
diff --git a/t/fcm-conflicts/03-tree-delete-rename.t b/usr/t/fcm-conflicts/03-tree-delete-rename.t
similarity index 100%
rename from t/fcm-conflicts/03-tree-delete-rename.t
rename to usr/t/fcm-conflicts/03-tree-delete-rename.t
diff --git a/t/fcm-conflicts/04-tree-edit-delete.t b/usr/t/fcm-conflicts/04-tree-edit-delete.t
similarity index 100%
rename from t/fcm-conflicts/04-tree-edit-delete.t
rename to usr/t/fcm-conflicts/04-tree-edit-delete.t
diff --git a/t/fcm-conflicts/05-tree-edit-rename.t b/usr/t/fcm-conflicts/05-tree-edit-rename.t
similarity index 100%
rename from t/fcm-conflicts/05-tree-edit-rename.t
rename to usr/t/fcm-conflicts/05-tree-edit-rename.t
diff --git a/t/fcm-conflicts/06-tree-rename-delete.t b/usr/t/fcm-conflicts/06-tree-rename-delete.t
similarity index 100%
rename from t/fcm-conflicts/06-tree-rename-delete.t
rename to usr/t/fcm-conflicts/06-tree-rename-delete.t
diff --git a/t/fcm-conflicts/07-tree-rename-edit.t b/usr/t/fcm-conflicts/07-tree-rename-edit.t
similarity index 100%
rename from t/fcm-conflicts/07-tree-rename-edit.t
rename to usr/t/fcm-conflicts/07-tree-rename-edit.t
diff --git a/t/fcm-conflicts/08-tree-rename-rename-diff.t b/usr/t/fcm-conflicts/08-tree-rename-rename-diff.t
similarity index 100%
rename from t/fcm-conflicts/08-tree-rename-rename-diff.t
rename to usr/t/fcm-conflicts/08-tree-rename-rename-diff.t
diff --git a/t/fcm-conflicts/09-tree-rename-rename-same.t b/usr/t/fcm-conflicts/09-tree-rename-rename-same.t
similarity index 100%
rename from t/fcm-conflicts/09-tree-rename-rename-same.t
rename to usr/t/fcm-conflicts/09-tree-rename-rename-same.t
diff --git a/t/fcm-conflicts/10-text.t b/usr/t/fcm-conflicts/10-text.t
similarity index 100%
rename from t/fcm-conflicts/10-text.t
rename to usr/t/fcm-conflicts/10-text.t
diff --git a/t/fcm-conflicts/11-tree-edit-replace.t b/usr/t/fcm-conflicts/11-tree-edit-replace.t
similarity index 100%
rename from t/fcm-conflicts/11-tree-edit-replace.t
rename to usr/t/fcm-conflicts/11-tree-edit-replace.t
diff --git a/t/fcm-conflicts/test_header b/usr/t/fcm-conflicts/test_header
similarity index 100%
rename from t/fcm-conflicts/test_header
rename to usr/t/fcm-conflicts/test_header
diff --git a/t/fcm-diff/00-simple.t b/usr/t/fcm-diff/00-simple.t
similarity index 100%
rename from t/fcm-diff/00-simple.t
rename to usr/t/fcm-diff/00-simple.t
diff --git a/t/fcm-diff/test_header b/usr/t/fcm-diff/test_header
similarity index 100%
rename from t/fcm-diff/test_header
rename to usr/t/fcm-diff/test_header
diff --git a/t/fcm-install-svn-hook/00-basic.t b/usr/t/fcm-install-svn-hook/00-basic.t
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic.t
rename to usr/t/fcm-install-svn-hook/00-basic.t
diff --git a/t/fcm-install-svn-hook/00-basic/clean-2.out b/usr/t/fcm-install-svn-hook/00-basic/clean-2.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/clean-2.out
rename to usr/t/fcm-install-svn-hook/00-basic/clean-2.out
diff --git a/t/fcm-install-svn-hook/00-basic/clean.out b/usr/t/fcm-install-svn-hook/00-basic/clean.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/clean.out
rename to usr/t/fcm-install-svn-hook/00-basic/clean.out
diff --git a/t/fcm-install-svn-hook/00-basic/commit-conf-2.out b/usr/t/fcm-install-svn-hook/00-basic/commit-conf-2.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/commit-conf-2.out
rename to usr/t/fcm-install-svn-hook/00-basic/commit-conf-2.out
diff --git a/t/fcm-install-svn-hook/00-basic/commit-conf-site-override-2.out b/usr/t/fcm-install-svn-hook/00-basic/commit-conf-site-override-2.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/commit-conf-site-override-2.out
rename to usr/t/fcm-install-svn-hook/00-basic/commit-conf-site-override-2.out
diff --git a/t/fcm-install-svn-hook/00-basic/commit-conf-site-override.out b/usr/t/fcm-install-svn-hook/00-basic/commit-conf-site-override.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/commit-conf-site-override.out
rename to usr/t/fcm-install-svn-hook/00-basic/commit-conf-site-override.out
diff --git a/t/fcm-install-svn-hook/00-basic/commit-conf.out b/usr/t/fcm-install-svn-hook/00-basic/commit-conf.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/commit-conf.out
rename to usr/t/fcm-install-svn-hook/00-basic/commit-conf.out
diff --git a/t/fcm-install-svn-hook/00-basic/new-2.out b/usr/t/fcm-install-svn-hook/00-basic/new-2.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/new-2.out
rename to usr/t/fcm-install-svn-hook/00-basic/new-2.out
diff --git a/t/fcm-install-svn-hook/00-basic/new.out b/usr/t/fcm-install-svn-hook/00-basic/new.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/new.out
rename to usr/t/fcm-install-svn-hook/00-basic/new.out
diff --git a/t/fcm-install-svn-hook/00-basic/svnperms-conf-2.out b/usr/t/fcm-install-svn-hook/00-basic/svnperms-conf-2.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/svnperms-conf-2.out
rename to usr/t/fcm-install-svn-hook/00-basic/svnperms-conf-2.out
diff --git a/t/fcm-install-svn-hook/00-basic/svnperms-conf.out b/usr/t/fcm-install-svn-hook/00-basic/svnperms-conf.out
similarity index 100%
rename from t/fcm-install-svn-hook/00-basic/svnperms-conf.out
rename to usr/t/fcm-install-svn-hook/00-basic/svnperms-conf.out
diff --git a/t/fcm-install-svn-hook/01-housekeep-log.t b/usr/t/fcm-install-svn-hook/01-housekeep-log.t
similarity index 100%
rename from t/fcm-install-svn-hook/01-housekeep-log.t
rename to usr/t/fcm-install-svn-hook/01-housekeep-log.t
diff --git a/t/fcm-install-svn-hook/01-housekeep-log/0-cmd0.out b/usr/t/fcm-install-svn-hook/01-housekeep-log/0-cmd0.out
similarity index 100%
rename from t/fcm-install-svn-hook/01-housekeep-log/0-cmd0.out
rename to usr/t/fcm-install-svn-hook/01-housekeep-log/0-cmd0.out
diff --git a/t/fcm-install-svn-hook/01-housekeep-log/0-cmd1.out b/usr/t/fcm-install-svn-hook/01-housekeep-log/0-cmd1.out
similarity index 100%
rename from t/fcm-install-svn-hook/01-housekeep-log/0-cmd1.out
rename to usr/t/fcm-install-svn-hook/01-housekeep-log/0-cmd1.out
diff --git a/t/fcm-install-svn-hook/01-housekeep-log/28-cmd.out b/usr/t/fcm-install-svn-hook/01-housekeep-log/28-cmd.out
similarity index 100%
rename from t/fcm-install-svn-hook/01-housekeep-log/28-cmd.out
rename to usr/t/fcm-install-svn-hook/01-housekeep-log/28-cmd.out
diff --git a/t/fcm-install-svn-hook/01-housekeep-log/7-cmd.out b/usr/t/fcm-install-svn-hook/01-housekeep-log/7-cmd.out
similarity index 100%
rename from t/fcm-install-svn-hook/01-housekeep-log/7-cmd.out
rename to usr/t/fcm-install-svn-hook/01-housekeep-log/7-cmd.out
diff --git a/t/fcm-install-svn-hook/02-env.t b/usr/t/fcm-install-svn-hook/02-env.t
similarity index 100%
rename from t/fcm-install-svn-hook/02-env.t
rename to usr/t/fcm-install-svn-hook/02-env.t
diff --git a/t/fcm-install-svn-hook/test_header b/usr/t/fcm-install-svn-hook/test_header
similarity index 100%
rename from t/fcm-install-svn-hook/test_header
rename to usr/t/fcm-install-svn-hook/test_header
diff --git a/t/fcm-install-svn-hook/test_header_more b/usr/t/fcm-install-svn-hook/test_header_more
similarity index 100%
rename from t/fcm-install-svn-hook/test_header_more
rename to usr/t/fcm-install-svn-hook/test_header_more
diff --git a/t/fcm-keyword-print/00-simple.t b/usr/t/fcm-keyword-print/00-simple.t
similarity index 100%
rename from t/fcm-keyword-print/00-simple.t
rename to usr/t/fcm-keyword-print/00-simple.t
diff --git a/t/fcm-keyword-print/test_header b/usr/t/fcm-keyword-print/test_header
similarity index 100%
rename from t/fcm-keyword-print/test_header
rename to usr/t/fcm-keyword-print/test_header
diff --git a/t/fcm-loc-layout/00-simple.t b/usr/t/fcm-loc-layout/00-simple.t
similarity index 100%
rename from t/fcm-loc-layout/00-simple.t
rename to usr/t/fcm-loc-layout/00-simple.t
diff --git a/t/fcm-loc-layout/test_header b/usr/t/fcm-loc-layout/test_header
similarity index 100%
rename from t/fcm-loc-layout/test_header
rename to usr/t/fcm-loc-layout/test_header
diff --git a/t/fcm-make/00-build-basic.t b/usr/t/fcm-make/00-build-basic.t
similarity index 100%
rename from t/fcm-make/00-build-basic.t
rename to usr/t/fcm-make/00-build-basic.t
diff --git a/t/fcm-make/00-build-basic/bin/my-ld b/usr/t/fcm-make/00-build-basic/bin/my-ld
similarity index 100%
rename from t/fcm-make/00-build-basic/bin/my-ld
rename to usr/t/fcm-make/00-build-basic/bin/my-ld
diff --git a/t/fcm-make/00-build-basic/fcm-make.cfg b/usr/t/fcm-make/00-build-basic/fcm-make.cfg
similarity index 70%
rename from t/fcm-make/00-build-basic/fcm-make.cfg
rename to usr/t/fcm-make/00-build-basic/fcm-make.cfg
index 81f4f9b..9cb47a0 100644
--- a/t/fcm-make/00-build-basic/fcm-make.cfg
+++ b/usr/t/fcm-make/00-build-basic/fcm-make.cfg
@@ -1,3 +1,4 @@
+description = There is nothing like a good test
 steps = build
 build.source = $HERE/src
 build.target{task} = link
diff --git a/t/fcm-make/00-build-basic/src/hello.f90 b/usr/t/fcm-make/00-build-basic/src/hello.f90
similarity index 100%
rename from t/fcm-make/00-build-basic/src/hello.f90
rename to usr/t/fcm-make/00-build-basic/src/hello.f90
diff --git a/t/fcm-make/00-build-basic/src/world.f90 b/usr/t/fcm-make/00-build-basic/src/world.f90
similarity index 100%
rename from t/fcm-make/00-build-basic/src/world.f90
rename to usr/t/fcm-make/00-build-basic/src/world.f90
diff --git a/t/fcm-make/01-build-link-opts b/usr/t/fcm-make/01-build-link-opts
similarity index 100%
rename from t/fcm-make/01-build-link-opts
rename to usr/t/fcm-make/01-build-link-opts
diff --git a/t/fcm-make/01-build-link-opts.t b/usr/t/fcm-make/01-build-link-opts.t
similarity index 66%
rename from t/fcm-make/01-build-link-opts.t
rename to usr/t/fcm-make/01-build-link-opts.t
index f9a3b9c..32b04a9 100755
--- a/t/fcm-make/01-build-link-opts.t
+++ b/usr/t/fcm-make/01-build-link-opts.t
@@ -21,38 +21,10 @@
 #-------------------------------------------------------------------------------
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
-tests 11
+tests 5
 cp -r $TEST_SOURCE_DIR/$TEST_KEY_BASE/* .
 PATH=$PWD/bin:$PATH
 #-------------------------------------------------------------------------------
-TEST_KEY="$TEST_KEY_BASE-keep-lib-o-incr"
-fcm make -q
-echo 'build.prop{keep-lib-o} = true' >>fcm-make.cfg
-find build -type f -exec stat -c'%Y %n' {} \; | sort >"$TEST_KEY.mtime.old"
-run_pass "$TEST_KEY" fcm make
-find build -type f -exec stat -c'%Y %n' {} \; | sort >"$TEST_KEY.mtime"
-if cmp -s "$TEST_KEY.mtime.old" "$TEST_KEY.mtime"; then
-    fail "$TEST_KEY.mtime"
-else
-    pass "$TEST_KEY.mtime"
-fi
-file_grep "$TEST_KEY.mtime.grep" 'lib/libhello[.]a' "$TEST_KEY.mtime"
-sed -i '/hello[.]exe/d' "$TEST_KEY.mtime.old"
-sed -i '/libhello[.]a/d; /hello[.]exe/d' "$TEST_KEY.mtime"
-file_cmp "$TEST_KEY.mtime.old" "$TEST_KEY.mtime.old" "$TEST_KEY.mtime"
-#-------------------------------------------------------------------------------
-TEST_KEY="$TEST_KEY_BASE-keep-lib-o-new"
-# echo 'build.prop{keep-lib-o} = true' >>fcm-make.cfg # already done above
-run_pass "$TEST_KEY" fcm make --new
-find build -type f | sort >"$TEST_KEY.find"
-file_cmp "$TEST_KEY.find" "$TEST_KEY.find" <<'__OUT__'
-build/bin/hello.exe
-build/include/world.mod
-build/lib/libhello.a
-build/o/hello.o
-build/o/world.o
-__OUT__
-#-------------------------------------------------------------------------------
 TEST_KEY="$TEST_KEY_BASE-ld-incr"
 cp -r $TEST_SOURCE_DIR/$TEST_KEY_BASE/fcm-make.cfg .
 fcm make -q --new
diff --git a/t/fcm-make/02-build-ext-iface.t b/usr/t/fcm-make/02-build-ext-iface.t
similarity index 100%
rename from t/fcm-make/02-build-ext-iface.t
rename to usr/t/fcm-make/02-build-ext-iface.t
diff --git a/t/fcm-make/02-build-ext-iface/expected/t1.interface b/usr/t/fcm-make/02-build-ext-iface/expected/t1.interface
similarity index 100%
rename from t/fcm-make/02-build-ext-iface/expected/t1.interface
rename to usr/t/fcm-make/02-build-ext-iface/expected/t1.interface
diff --git a/t/fcm-make/02-build-ext-iface/expected/t2.interface b/usr/t/fcm-make/02-build-ext-iface/expected/t2.interface
similarity index 100%
rename from t/fcm-make/02-build-ext-iface/expected/t2.interface
rename to usr/t/fcm-make/02-build-ext-iface/expected/t2.interface
diff --git a/t/fcm-make/02-build-ext-iface/fcm-make.cfg b/usr/t/fcm-make/02-build-ext-iface/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/02-build-ext-iface/fcm-make.cfg
rename to usr/t/fcm-make/02-build-ext-iface/fcm-make.cfg
diff --git a/t/fcm-make/02-build-ext-iface/src/m1.f90 b/usr/t/fcm-make/02-build-ext-iface/src/m1.f90
similarity index 100%
rename from t/fcm-make/02-build-ext-iface/src/m1.f90
rename to usr/t/fcm-make/02-build-ext-iface/src/m1.f90
diff --git a/t/fcm-make/02-build-ext-iface/src/t1.f90 b/usr/t/fcm-make/02-build-ext-iface/src/t1.f90
similarity index 100%
rename from t/fcm-make/02-build-ext-iface/src/t1.f90
rename to usr/t/fcm-make/02-build-ext-iface/src/t1.f90
diff --git a/t/fcm-make/02-build-ext-iface/src/t2.f90 b/usr/t/fcm-make/02-build-ext-iface/src/t2.f90
similarity index 100%
rename from t/fcm-make/02-build-ext-iface/src/t2.f90
rename to usr/t/fcm-make/02-build-ext-iface/src/t2.f90
diff --git a/t/fcm-make/03-build-include-paths.t b/usr/t/fcm-make/03-build-include-paths.t
similarity index 100%
rename from t/fcm-make/03-build-include-paths.t
rename to usr/t/fcm-make/03-build-include-paths.t
diff --git a/t/fcm-make/03-build-include-paths/fcm-make.cfg b/usr/t/fcm-make/03-build-include-paths/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/03-build-include-paths/fcm-make.cfg
rename to usr/t/fcm-make/03-build-include-paths/fcm-make.cfg
diff --git a/t/fcm-make/03-build-include-paths/include/world1/worldx.f90 b/usr/t/fcm-make/03-build-include-paths/include/world1/worldx.f90
similarity index 100%
rename from t/fcm-make/03-build-include-paths/include/world1/worldx.f90
rename to usr/t/fcm-make/03-build-include-paths/include/world1/worldx.f90
diff --git a/t/fcm-make/03-build-include-paths/include/world2/worldx.f90 b/usr/t/fcm-make/03-build-include-paths/include/world2/worldx.f90
similarity index 100%
rename from t/fcm-make/03-build-include-paths/include/world2/worldx.f90
rename to usr/t/fcm-make/03-build-include-paths/include/world2/worldx.f90
diff --git a/t/fcm-make/03-build-include-paths/src/hello.f90 b/usr/t/fcm-make/03-build-include-paths/src/hello.f90
similarity index 100%
rename from t/fcm-make/03-build-include-paths/src/hello.f90
rename to usr/t/fcm-make/03-build-include-paths/src/hello.f90
diff --git a/t/fcm-make/03-build-include-paths/src/world.f90 b/usr/t/fcm-make/03-build-include-paths/src/world.f90
similarity index 100%
rename from t/fcm-make/03-build-include-paths/src/world.f90
rename to usr/t/fcm-make/03-build-include-paths/src/world.f90
diff --git a/t/fcm-make/04-build-libs.t b/usr/t/fcm-make/04-build-libs.t
similarity index 100%
rename from t/fcm-make/04-build-libs.t
rename to usr/t/fcm-make/04-build-libs.t
diff --git a/t/fcm-make/04-build-libs/fcm-make.cfg b/usr/t/fcm-make/04-build-libs/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/04-build-libs/fcm-make.cfg
rename to usr/t/fcm-make/04-build-libs/fcm-make.cfg
diff --git a/t/fcm-make/04-build-libs/src-lib/earth.f90 b/usr/t/fcm-make/04-build-libs/src-lib/earth.f90
similarity index 100%
rename from t/fcm-make/04-build-libs/src-lib/earth.f90
rename to usr/t/fcm-make/04-build-libs/src-lib/earth.f90
diff --git a/t/fcm-make/04-build-libs/src-lib/greet.f90 b/usr/t/fcm-make/04-build-libs/src-lib/greet.f90
similarity index 100%
rename from t/fcm-make/04-build-libs/src-lib/greet.f90
rename to usr/t/fcm-make/04-build-libs/src-lib/greet.f90
diff --git a/t/fcm-make/04-build-libs/src-lib/moon.f90 b/usr/t/fcm-make/04-build-libs/src-lib/moon.f90
similarity index 100%
rename from t/fcm-make/04-build-libs/src-lib/moon.f90
rename to usr/t/fcm-make/04-build-libs/src-lib/moon.f90
diff --git a/t/fcm-make/04-build-libs/src/hello.f90 b/usr/t/fcm-make/04-build-libs/src/hello.f90
similarity index 100%
rename from t/fcm-make/04-build-libs/src/hello.f90
rename to usr/t/fcm-make/04-build-libs/src/hello.f90
diff --git a/t/fcm-make/05-build-c-cxx-basic.t b/usr/t/fcm-make/05-build-c-cxx-basic.t
similarity index 100%
rename from t/fcm-make/05-build-c-cxx-basic.t
rename to usr/t/fcm-make/05-build-c-cxx-basic.t
diff --git a/t/fcm-make/05-build-c-cxx-basic/fcm-make.cfg b/usr/t/fcm-make/05-build-c-cxx-basic/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/05-build-c-cxx-basic/fcm-make.cfg
rename to usr/t/fcm-make/05-build-c-cxx-basic/fcm-make.cfg
diff --git a/t/fcm-make/05-build-c-cxx-basic/src/chello.c b/usr/t/fcm-make/05-build-c-cxx-basic/src/chello.c
similarity index 100%
rename from t/fcm-make/05-build-c-cxx-basic/src/chello.c
rename to usr/t/fcm-make/05-build-c-cxx-basic/src/chello.c
diff --git a/t/fcm-make/05-build-c-cxx-basic/src/cxxhello.cxx b/usr/t/fcm-make/05-build-c-cxx-basic/src/cxxhello.cxx
similarity index 100%
rename from t/fcm-make/05-build-c-cxx-basic/src/cxxhello.cxx
rename to usr/t/fcm-make/05-build-c-cxx-basic/src/cxxhello.cxx
diff --git a/t/fcm-make/06-extract-ssh.t b/usr/t/fcm-make/06-extract-ssh.t
similarity index 100%
rename from t/fcm-make/06-extract-ssh.t
rename to usr/t/fcm-make/06-extract-ssh.t
diff --git a/t/fcm-make/07-build-ns-dep.t b/usr/t/fcm-make/07-build-ns-dep.t
similarity index 100%
rename from t/fcm-make/07-build-ns-dep.t
rename to usr/t/fcm-make/07-build-ns-dep.t
diff --git a/t/fcm-make/07-build-ns-dep/fcm-make.cfg b/usr/t/fcm-make/07-build-ns-dep/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/07-build-ns-dep/fcm-make.cfg
rename to usr/t/fcm-make/07-build-ns-dep/fcm-make.cfg
diff --git a/t/fcm-make/07-build-ns-dep/src/lib/earth.f90 b/usr/t/fcm-make/07-build-ns-dep/src/lib/earth.f90
similarity index 100%
rename from t/fcm-make/07-build-ns-dep/src/lib/earth.f90
rename to usr/t/fcm-make/07-build-ns-dep/src/lib/earth.f90
diff --git a/t/fcm-make/07-build-ns-dep/src/lib/greet.f90 b/usr/t/fcm-make/07-build-ns-dep/src/lib/greet.f90
similarity index 100%
rename from t/fcm-make/07-build-ns-dep/src/lib/greet.f90
rename to usr/t/fcm-make/07-build-ns-dep/src/lib/greet.f90
diff --git a/t/fcm-make/07-build-ns-dep/src/main/hello.f90 b/usr/t/fcm-make/07-build-ns-dep/src/main/hello.f90
similarity index 100%
rename from t/fcm-make/07-build-ns-dep/src/main/hello.f90
rename to usr/t/fcm-make/07-build-ns-dep/src/main/hello.f90
diff --git a/t/fcm-make/08-build-dup-dep.t b/usr/t/fcm-make/08-build-dup-dep.t
similarity index 100%
rename from t/fcm-make/08-build-dup-dep.t
rename to usr/t/fcm-make/08-build-dup-dep.t
diff --git a/t/fcm-make/08-build-dup-dep/fcm-make.cfg b/usr/t/fcm-make/08-build-dup-dep/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/08-build-dup-dep/fcm-make.cfg
rename to usr/t/fcm-make/08-build-dup-dep/fcm-make.cfg
diff --git a/t/fcm-make/08-build-dup-dep/src/lib/earth.f90 b/usr/t/fcm-make/08-build-dup-dep/src/lib/earth.f90
similarity index 100%
rename from t/fcm-make/08-build-dup-dep/src/lib/earth.f90
rename to usr/t/fcm-make/08-build-dup-dep/src/lib/earth.f90
diff --git a/t/fcm-make/08-build-dup-dep/src/lib/greet.f90 b/usr/t/fcm-make/08-build-dup-dep/src/lib/greet.f90
similarity index 100%
rename from t/fcm-make/08-build-dup-dep/src/lib/greet.f90
rename to usr/t/fcm-make/08-build-dup-dep/src/lib/greet.f90
diff --git a/t/fcm-make/08-build-dup-dep/src/lib/moon.f90 b/usr/t/fcm-make/08-build-dup-dep/src/lib/moon.f90
similarity index 100%
rename from t/fcm-make/08-build-dup-dep/src/lib/moon.f90
rename to usr/t/fcm-make/08-build-dup-dep/src/lib/moon.f90
diff --git a/t/fcm-make/08-build-dup-dep/src/main/hello.f90 b/usr/t/fcm-make/08-build-dup-dep/src/main/hello.f90
similarity index 100%
rename from t/fcm-make/08-build-dup-dep/src/main/hello.f90
rename to usr/t/fcm-make/08-build-dup-dep/src/main/hello.f90
diff --git a/t/fcm-make/09-build-dep-o.t b/usr/t/fcm-make/09-build-dep-o.t
similarity index 100%
rename from t/fcm-make/09-build-dep-o.t
rename to usr/t/fcm-make/09-build-dep-o.t
diff --git a/t/fcm-make/09-build-dep-o/fcm-make.cfg b/usr/t/fcm-make/09-build-dep-o/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/09-build-dep-o/fcm-make.cfg
rename to usr/t/fcm-make/09-build-dep-o/fcm-make.cfg
diff --git a/t/fcm-make/09-build-dep-o/src/lib/earth.f90 b/usr/t/fcm-make/09-build-dep-o/src/lib/earth.f90
similarity index 100%
rename from t/fcm-make/09-build-dep-o/src/lib/earth.f90
rename to usr/t/fcm-make/09-build-dep-o/src/lib/earth.f90
diff --git a/t/fcm-make/09-build-dep-o/src/lib/greet.f90 b/usr/t/fcm-make/09-build-dep-o/src/lib/greet.f90
similarity index 100%
rename from t/fcm-make/09-build-dep-o/src/lib/greet.f90
rename to usr/t/fcm-make/09-build-dep-o/src/lib/greet.f90
diff --git a/t/fcm-make/09-build-dep-o/src/lib/greet_fmt_mod.f90 b/usr/t/fcm-make/09-build-dep-o/src/lib/greet_fmt_mod.f90
similarity index 100%
rename from t/fcm-make/09-build-dep-o/src/lib/greet_fmt_mod.f90
rename to usr/t/fcm-make/09-build-dep-o/src/lib/greet_fmt_mod.f90
diff --git a/t/fcm-make/09-build-dep-o/src/main/hello.f90 b/usr/t/fcm-make/09-build-dep-o/src/main/hello.f90
similarity index 100%
rename from t/fcm-make/09-build-dep-o/src/main/hello.f90
rename to usr/t/fcm-make/09-build-dep-o/src/main/hello.f90
diff --git a/t/fcm-make/09-build-dep-o/src/main/hi.f90 b/usr/t/fcm-make/09-build-dep-o/src/main/hi.f90
similarity index 100%
rename from t/fcm-make/09-build-dep-o/src/main/hi.f90
rename to usr/t/fcm-make/09-build-dep-o/src/main/hi.f90
diff --git a/t/fcm-make/10-log b/usr/t/fcm-make/10-log
similarity index 100%
rename from t/fcm-make/10-log
rename to usr/t/fcm-make/10-log
diff --git a/t/fcm-make/10-log.t b/usr/t/fcm-make/10-log.t
similarity index 90%
rename from t/fcm-make/10-log.t
rename to usr/t/fcm-make/10-log.t
index dc8c8db..28ee228 100755
--- a/t/fcm-make/10-log.t
+++ b/usr/t/fcm-make/10-log.t
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------------
 . $(dirname $0)/test_header
 #-------------------------------------------------------------------------------
-tests 11
+tests 12
 cp -r $TEST_SOURCE_DIR/$TEST_KEY_BASE/* .
 #-------------------------------------------------------------------------------
 TEST_KEY="$TEST_KEY_BASE"
@@ -33,8 +33,10 @@ else
         $FCM_HOME/doc/etc/fcm-version.js)
     VERSION="FCM $VERSION"
 fi
-file_grep "$TEST_KEY.log.version" "\\[info\\] $VERSION" .fcm-make/log
-file_grep "$TEST_KEY.log.mode" '\[info\] mode=new' .fcm-make/log
+file_grep "${TEST_KEY}.log.version" "\\[info\\] ${VERSION}" '.fcm-make/log'
+file_grep "${TEST_KEY}.log.mode" '\[info\] mode=new' '.fcm-make/log'
+file_grep "${TEST_KEY}.log.description" \
+    '\[info\] description=There is nothing like a good test' '.fcm-make/log'
 if [[ $(ls .fcm-make/log-* | wc -l) == 1 ]]; then
     pass "$TEST_KEY-n-logs"
 else
diff --git a/t/fcm-make/11-preprocess-include-path.t b/usr/t/fcm-make/11-preprocess-include-path.t
similarity index 100%
rename from t/fcm-make/11-preprocess-include-path.t
rename to usr/t/fcm-make/11-preprocess-include-path.t
diff --git a/t/fcm-make/11-preprocess-include-path/fcm-make.cfg b/usr/t/fcm-make/11-preprocess-include-path/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/11-preprocess-include-path/fcm-make.cfg
rename to usr/t/fcm-make/11-preprocess-include-path/fcm-make.cfg
diff --git a/t/fcm-make/11-preprocess-include-path/include/world1/worldx.h b/usr/t/fcm-make/11-preprocess-include-path/include/world1/worldx.h
similarity index 100%
rename from t/fcm-make/11-preprocess-include-path/include/world1/worldx.h
rename to usr/t/fcm-make/11-preprocess-include-path/include/world1/worldx.h
diff --git a/t/fcm-make/11-preprocess-include-path/include/world2/worldx.h b/usr/t/fcm-make/11-preprocess-include-path/include/world2/worldx.h
similarity index 100%
rename from t/fcm-make/11-preprocess-include-path/include/world2/worldx.h
rename to usr/t/fcm-make/11-preprocess-include-path/include/world2/worldx.h
diff --git a/t/fcm-make/11-preprocess-include-path/src/world.F90 b/usr/t/fcm-make/11-preprocess-include-path/src/world.F90
similarity index 100%
rename from t/fcm-make/11-preprocess-include-path/src/world.F90
rename to usr/t/fcm-make/11-preprocess-include-path/src/world.F90
diff --git a/t/fcm-make/12-build-class-prop.t b/usr/t/fcm-make/12-build-class-prop.t
similarity index 100%
rename from t/fcm-make/12-build-class-prop.t
rename to usr/t/fcm-make/12-build-class-prop.t
diff --git a/t/fcm-make/12-build-class-prop/bin/my-fc b/usr/t/fcm-make/12-build-class-prop/bin/my-fc
similarity index 100%
rename from t/fcm-make/12-build-class-prop/bin/my-fc
rename to usr/t/fcm-make/12-build-class-prop/bin/my-fc
diff --git a/t/fcm-make/12-build-class-prop/fcm-make.cfg b/usr/t/fcm-make/12-build-class-prop/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/12-build-class-prop/fcm-make.cfg
rename to usr/t/fcm-make/12-build-class-prop/fcm-make.cfg
diff --git a/t/fcm-make/12-build-class-prop/src/hello.f90 b/usr/t/fcm-make/12-build-class-prop/src/hello.f90
similarity index 100%
rename from t/fcm-make/12-build-class-prop/src/hello.f90
rename to usr/t/fcm-make/12-build-class-prop/src/hello.f90
diff --git a/t/fcm-make/12-build-class-prop/src/hello_house.f90 b/usr/t/fcm-make/12-build-class-prop/src/hello_house.f90
similarity index 100%
rename from t/fcm-make/12-build-class-prop/src/hello_house.f90
rename to usr/t/fcm-make/12-build-class-prop/src/hello_house.f90
diff --git a/t/fcm-make/12-build-class-prop/src/hello_office.f90 b/usr/t/fcm-make/12-build-class-prop/src/hello_office.f90
similarity index 100%
rename from t/fcm-make/12-build-class-prop/src/hello_office.f90
rename to usr/t/fcm-make/12-build-class-prop/src/hello_office.f90
diff --git a/t/fcm-make/12-build-class-prop/src/hello_road.f90 b/usr/t/fcm-make/12-build-class-prop/src/hello_road.f90
similarity index 100%
rename from t/fcm-make/12-build-class-prop/src/hello_road.f90
rename to usr/t/fcm-make/12-build-class-prop/src/hello_road.f90
diff --git a/t/fcm-make/13-build-target-prop.t b/usr/t/fcm-make/13-build-target-prop.t
similarity index 100%
rename from t/fcm-make/13-build-target-prop.t
rename to usr/t/fcm-make/13-build-target-prop.t
diff --git a/t/fcm-make/13-build-target-prop/bin/my-fc b/usr/t/fcm-make/13-build-target-prop/bin/my-fc
similarity index 100%
rename from t/fcm-make/13-build-target-prop/bin/my-fc
rename to usr/t/fcm-make/13-build-target-prop/bin/my-fc
diff --git a/t/fcm-make/13-build-target-prop/fcm-make.cfg b/usr/t/fcm-make/13-build-target-prop/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/13-build-target-prop/fcm-make.cfg
rename to usr/t/fcm-make/13-build-target-prop/fcm-make.cfg
diff --git a/t/fcm-make/13-build-target-prop/src/hello.f90 b/usr/t/fcm-make/13-build-target-prop/src/hello.f90
similarity index 100%
rename from t/fcm-make/13-build-target-prop/src/hello.f90
rename to usr/t/fcm-make/13-build-target-prop/src/hello.f90
diff --git a/t/fcm-make/13-build-target-prop/src/world.f90 b/usr/t/fcm-make/13-build-target-prop/src/world.f90
similarity index 100%
rename from t/fcm-make/13-build-target-prop/src/world.f90
rename to usr/t/fcm-make/13-build-target-prop/src/world.f90
diff --git a/t/fcm-make/14-build-etc.t b/usr/t/fcm-make/14-build-etc.t
similarity index 100%
rename from t/fcm-make/14-build-etc.t
rename to usr/t/fcm-make/14-build-etc.t
diff --git a/t/fcm-make/14-build-etc/fcm-make.cfg b/usr/t/fcm-make/14-build-etc/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/14-build-etc/fcm-make.cfg
rename to usr/t/fcm-make/14-build-etc/fcm-make.cfg
diff --git a/t/fcm-make/14-build-etc/src/foo b/usr/t/fcm-make/14-build-etc/src/foo
similarity index 100%
rename from t/fcm-make/14-build-etc/src/foo
rename to usr/t/fcm-make/14-build-etc/src/foo
diff --git a/t/fcm-make/14-build-etc/src/hello.txt b/usr/t/fcm-make/14-build-etc/src/hello.txt
similarity index 100%
rename from t/fcm-make/14-build-etc/src/hello.txt
rename to usr/t/fcm-make/14-build-etc/src/hello.txt
diff --git a/t/fcm-make/14-build-etc/src/hi/hi-earth.txt b/usr/t/fcm-make/14-build-etc/src/hi/hi-earth.txt
similarity index 100%
rename from t/fcm-make/14-build-etc/src/hi/hi-earth.txt
rename to usr/t/fcm-make/14-build-etc/src/hi/hi-earth.txt
diff --git a/t/fcm-make/14-build-etc/src/hi/hi-mars.txt b/usr/t/fcm-make/14-build-etc/src/hi/hi-mars.txt
similarity index 100%
rename from t/fcm-make/14-build-etc/src/hi/hi-mars.txt
rename to usr/t/fcm-make/14-build-etc/src/hi/hi-mars.txt
diff --git a/t/fcm-make/15-extract-loc-reset.t b/usr/t/fcm-make/15-extract-loc-reset.t
similarity index 100%
rename from t/fcm-make/15-extract-loc-reset.t
rename to usr/t/fcm-make/15-extract-loc-reset.t
diff --git a/t/fcm-make/16-build-dep-o-2.t b/usr/t/fcm-make/16-build-dep-o-2.t
similarity index 100%
rename from t/fcm-make/16-build-dep-o-2.t
rename to usr/t/fcm-make/16-build-dep-o-2.t
diff --git a/t/fcm-make/16-build-dep-o-2/fcm-make.cfg b/usr/t/fcm-make/16-build-dep-o-2/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/16-build-dep-o-2/fcm-make.cfg
rename to usr/t/fcm-make/16-build-dep-o-2/fcm-make.cfg
diff --git a/t/fcm-make/16-build-dep-o-2/src/hello.f90 b/usr/t/fcm-make/16-build-dep-o-2/src/hello.f90
similarity index 100%
rename from t/fcm-make/16-build-dep-o-2/src/hello.f90
rename to usr/t/fcm-make/16-build-dep-o-2/src/hello.f90
diff --git a/t/fcm-make/16-build-dep-o-2/src/hello_mod.f90 b/usr/t/fcm-make/16-build-dep-o-2/src/hello_mod.f90
similarity index 100%
rename from t/fcm-make/16-build-dep-o-2/src/hello_mod.f90
rename to usr/t/fcm-make/16-build-dep-o-2/src/hello_mod.f90
diff --git a/t/fcm-make/16-build-dep-o-2/src/hello_sub.f90 b/usr/t/fcm-make/16-build-dep-o-2/src/hello_sub.f90
similarity index 100%
rename from t/fcm-make/16-build-dep-o-2/src/hello_sub.f90
rename to usr/t/fcm-make/16-build-dep-o-2/src/hello_sub.f90
diff --git a/t/fcm-make/17-build-cyclic.t b/usr/t/fcm-make/17-build-cyclic.t
similarity index 100%
rename from t/fcm-make/17-build-cyclic.t
rename to usr/t/fcm-make/17-build-cyclic.t
diff --git a/t/fcm-make/17-build-cyclic/fcm-make.cfg b/usr/t/fcm-make/17-build-cyclic/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/17-build-cyclic/fcm-make.cfg
rename to usr/t/fcm-make/17-build-cyclic/fcm-make.cfg
diff --git a/t/fcm-make/17-build-cyclic/src/bar.f90 b/usr/t/fcm-make/17-build-cyclic/src/bar.f90
similarity index 100%
rename from t/fcm-make/17-build-cyclic/src/bar.f90
rename to usr/t/fcm-make/17-build-cyclic/src/bar.f90
diff --git a/t/fcm-make/17-build-cyclic/src/baz.f90 b/usr/t/fcm-make/17-build-cyclic/src/baz.f90
similarity index 100%
rename from t/fcm-make/17-build-cyclic/src/baz.f90
rename to usr/t/fcm-make/17-build-cyclic/src/baz.f90
diff --git a/t/fcm-make/17-build-cyclic/src/foo.f90 b/usr/t/fcm-make/17-build-cyclic/src/foo.f90
similarity index 100%
rename from t/fcm-make/17-build-cyclic/src/foo.f90
rename to usr/t/fcm-make/17-build-cyclic/src/foo.f90
diff --git a/t/fcm-make/17-build-cyclic/src/hello.f90 b/usr/t/fcm-make/17-build-cyclic/src/hello.f90
similarity index 100%
rename from t/fcm-make/17-build-cyclic/src/hello.f90
rename to usr/t/fcm-make/17-build-cyclic/src/hello.f90
diff --git a/t/fcm-make/17-build-cyclic/src/meow.f90 b/usr/t/fcm-make/17-build-cyclic/src/meow.f90
similarity index 100%
rename from t/fcm-make/17-build-cyclic/src/meow.f90
rename to usr/t/fcm-make/17-build-cyclic/src/meow.f90
diff --git a/t/fcm-make/17-build-cyclic/src/quack.f90 b/usr/t/fcm-make/17-build-cyclic/src/quack.f90
similarity index 100%
rename from t/fcm-make/17-build-cyclic/src/quack.f90
rename to usr/t/fcm-make/17-build-cyclic/src/quack.f90
diff --git a/t/fcm-make/18-build-use-intrinsic.t b/usr/t/fcm-make/18-build-use-intrinsic.t
similarity index 100%
rename from t/fcm-make/18-build-use-intrinsic.t
rename to usr/t/fcm-make/18-build-use-intrinsic.t
diff --git a/t/fcm-make/18-build-use-intrinsic/fcm-make.cfg b/usr/t/fcm-make/18-build-use-intrinsic/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/18-build-use-intrinsic/fcm-make.cfg
rename to usr/t/fcm-make/18-build-use-intrinsic/fcm-make.cfg
diff --git a/t/fcm-make/18-build-use-intrinsic/src/greet.f90 b/usr/t/fcm-make/18-build-use-intrinsic/src/greet.f90
similarity index 100%
rename from t/fcm-make/18-build-use-intrinsic/src/greet.f90
rename to usr/t/fcm-make/18-build-use-intrinsic/src/greet.f90
diff --git a/t/fcm-make/18-build-use-intrinsic/src/hello.f90 b/usr/t/fcm-make/18-build-use-intrinsic/src/hello.f90
similarity index 100%
rename from t/fcm-make/18-build-use-intrinsic/src/hello.f90
rename to usr/t/fcm-make/18-build-use-intrinsic/src/hello.f90
diff --git a/t/fcm-make/18-build-use-intrinsic/src/hi.f90 b/usr/t/fcm-make/18-build-use-intrinsic/src/hi.f90
similarity index 100%
rename from t/fcm-make/18-build-use-intrinsic/src/hi.f90
rename to usr/t/fcm-make/18-build-use-intrinsic/src/hi.f90
diff --git a/t/fcm-make/19-build-inherit-prop.t b/usr/t/fcm-make/19-build-inherit-prop.t
similarity index 100%
rename from t/fcm-make/19-build-inherit-prop.t
rename to usr/t/fcm-make/19-build-inherit-prop.t
diff --git a/t/fcm-make/19-build-inherit-prop/fcm-make.cfg b/usr/t/fcm-make/19-build-inherit-prop/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/19-build-inherit-prop/fcm-make.cfg
rename to usr/t/fcm-make/19-build-inherit-prop/fcm-make.cfg
diff --git a/t/fcm-make/19-build-inherit-prop/src/hello.F90 b/usr/t/fcm-make/19-build-inherit-prop/src/hello.F90
similarity index 100%
rename from t/fcm-make/19-build-inherit-prop/src/hello.F90
rename to usr/t/fcm-make/19-build-inherit-prop/src/hello.F90
diff --git a/t/fcm-make/20-args.t b/usr/t/fcm-make/20-args.t
similarity index 100%
rename from t/fcm-make/20-args.t
rename to usr/t/fcm-make/20-args.t
diff --git a/t/fcm-make/20-args/fcm-make.cfg b/usr/t/fcm-make/20-args/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/20-args/fcm-make.cfg
rename to usr/t/fcm-make/20-args/fcm-make.cfg
diff --git a/t/fcm-make/20-args/src/greet.f90 b/usr/t/fcm-make/20-args/src/greet.f90
similarity index 100%
rename from t/fcm-make/20-args/src/greet.f90
rename to usr/t/fcm-make/20-args/src/greet.f90
diff --git a/t/fcm-make/20-args/src/hello.f90 b/usr/t/fcm-make/20-args/src/hello.f90
similarity index 100%
rename from t/fcm-make/20-args/src/hello.f90
rename to usr/t/fcm-make/20-args/src/hello.f90
diff --git a/t/fcm-make/21-inherit-steps.t b/usr/t/fcm-make/21-inherit-steps.t
similarity index 100%
rename from t/fcm-make/21-inherit-steps.t
rename to usr/t/fcm-make/21-inherit-steps.t
diff --git a/t/fcm-make/21-inherit-steps/fcm-make.cfg b/usr/t/fcm-make/21-inherit-steps/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/21-inherit-steps/fcm-make.cfg
rename to usr/t/fcm-make/21-inherit-steps/fcm-make.cfg
diff --git a/t/fcm-make/21-inherit-steps/src1/hello.f90 b/usr/t/fcm-make/21-inherit-steps/src1/hello.f90
similarity index 100%
rename from t/fcm-make/21-inherit-steps/src1/hello.f90
rename to usr/t/fcm-make/21-inherit-steps/src1/hello.f90
diff --git a/t/fcm-make/21-inherit-steps/src2/salute.f90 b/usr/t/fcm-make/21-inherit-steps/src2/salute.f90
similarity index 100%
rename from t/fcm-make/21-inherit-steps/src2/salute.f90
rename to usr/t/fcm-make/21-inherit-steps/src2/salute.f90
diff --git a/t/fcm-make/21-inherit-steps/src3/greet.f90 b/usr/t/fcm-make/21-inherit-steps/src3/greet.f90
similarity index 100%
rename from t/fcm-make/21-inherit-steps/src3/greet.f90
rename to usr/t/fcm-make/21-inherit-steps/src3/greet.f90
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit.t b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit.t
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit.t
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit.t
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit/fcm-make.cfg b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit/fcm-make.cfg
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit/fcm-make.cfg
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m1.f90 b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m1.f90
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m1.f90
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m1.f90
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m2.f90 b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m2.f90
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m2.f90
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src-i/m2.f90
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit/src/m1.f90 b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src/m1.f90
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit/src/m1.f90
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src/m1.f90
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit/src/m2.f90 b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src/m2.f90
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit/src/m2.f90
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src/m2.f90
diff --git a/t/fcm-make/22-build-2-bad-mod-over-inherit/src/p1.f90 b/usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src/p1.f90
similarity index 100%
rename from t/fcm-make/22-build-2-bad-mod-over-inherit/src/p1.f90
rename to usr/t/fcm-make/22-build-2-bad-mod-over-inherit/src/p1.f90
diff --git a/t/fcm-make/23-build-omp.t b/usr/t/fcm-make/23-build-omp.t
similarity index 100%
rename from t/fcm-make/23-build-omp.t
rename to usr/t/fcm-make/23-build-omp.t
diff --git a/t/fcm-make/23-build-omp/fcm-make.cfg b/usr/t/fcm-make/23-build-omp/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/23-build-omp/fcm-make.cfg
rename to usr/t/fcm-make/23-build-omp/fcm-make.cfg
diff --git a/t/fcm-make/23-build-omp/src/i1.f90 b/usr/t/fcm-make/23-build-omp/src/i1.f90
similarity index 100%
rename from t/fcm-make/23-build-omp/src/i1.f90
rename to usr/t/fcm-make/23-build-omp/src/i1.f90
diff --git a/t/fcm-make/23-build-omp/src/i2.f90 b/usr/t/fcm-make/23-build-omp/src/i2.f90
similarity index 100%
rename from t/fcm-make/23-build-omp/src/i2.f90
rename to usr/t/fcm-make/23-build-omp/src/i2.f90
diff --git a/t/fcm-make/23-build-omp/src/m1.f90 b/usr/t/fcm-make/23-build-omp/src/m1.f90
similarity index 100%
rename from t/fcm-make/23-build-omp/src/m1.f90
rename to usr/t/fcm-make/23-build-omp/src/m1.f90
diff --git a/t/fcm-make/23-build-omp/src/m2.f90 b/usr/t/fcm-make/23-build-omp/src/m2.f90
similarity index 100%
rename from t/fcm-make/23-build-omp/src/m2.f90
rename to usr/t/fcm-make/23-build-omp/src/m2.f90
diff --git a/t/fcm-make/23-build-omp/src/p1.f90 b/usr/t/fcm-make/23-build-omp/src/p1.f90
similarity index 100%
rename from t/fcm-make/23-build-omp/src/p1.f90
rename to usr/t/fcm-make/23-build-omp/src/p1.f90
diff --git a/t/fcm-make/23-build-omp/src/s3.f90 b/usr/t/fcm-make/23-build-omp/src/s3.f90
similarity index 100%
rename from t/fcm-make/23-build-omp/src/s3.f90
rename to usr/t/fcm-make/23-build-omp/src/s3.f90
diff --git a/t/fcm-make/24-build-c-main-camel.t b/usr/t/fcm-make/24-build-c-main-camel.t
similarity index 100%
rename from t/fcm-make/24-build-c-main-camel.t
rename to usr/t/fcm-make/24-build-c-main-camel.t
diff --git a/t/fcm-make/24-build-c-main-camel/fcm-make.cfg b/usr/t/fcm-make/24-build-c-main-camel/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/24-build-c-main-camel/fcm-make.cfg
rename to usr/t/fcm-make/24-build-c-main-camel/fcm-make.cfg
diff --git a/t/fcm-make/24-build-c-main-camel/src/Hello.c b/usr/t/fcm-make/24-build-c-main-camel/src/Hello.c
similarity index 100%
rename from t/fcm-make/24-build-c-main-camel/src/Hello.c
rename to usr/t/fcm-make/24-build-c-main-camel/src/Hello.c
diff --git a/t/fcm-make/25-build-cyclic-2.t b/usr/t/fcm-make/25-build-cyclic-2.t
similarity index 100%
rename from t/fcm-make/25-build-cyclic-2.t
rename to usr/t/fcm-make/25-build-cyclic-2.t
diff --git a/t/fcm-make/25-build-cyclic-2/fcm-make.cfg b/usr/t/fcm-make/25-build-cyclic-2/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/25-build-cyclic-2/fcm-make.cfg
rename to usr/t/fcm-make/25-build-cyclic-2/fcm-make.cfg
diff --git a/t/fcm-make/25-build-cyclic-2/src/foo.f90 b/usr/t/fcm-make/25-build-cyclic-2/src/foo.f90
similarity index 100%
rename from t/fcm-make/25-build-cyclic-2/src/foo.f90
rename to usr/t/fcm-make/25-build-cyclic-2/src/foo.f90
diff --git a/t/fcm-make/25-build-cyclic-2/src/m1.f90 b/usr/t/fcm-make/25-build-cyclic-2/src/m1.f90
similarity index 100%
rename from t/fcm-make/25-build-cyclic-2/src/m1.f90
rename to usr/t/fcm-make/25-build-cyclic-2/src/m1.f90
diff --git a/t/fcm-make/25-build-cyclic-2/src/m2.f90 b/usr/t/fcm-make/25-build-cyclic-2/src/m2.f90
similarity index 100%
rename from t/fcm-make/25-build-cyclic-2/src/m2.f90
rename to usr/t/fcm-make/25-build-cyclic-2/src/m2.f90
diff --git a/t/fcm-make/26-no-config.t b/usr/t/fcm-make/26-no-config.t
similarity index 100%
rename from t/fcm-make/26-no-config.t
rename to usr/t/fcm-make/26-no-config.t
diff --git a/t/fcm-make/27-args-only.t b/usr/t/fcm-make/27-args-only.t
similarity index 100%
rename from t/fcm-make/27-args-only.t
rename to usr/t/fcm-make/27-args-only.t
diff --git a/t/fcm-make/28-bad-arg.t b/usr/t/fcm-make/28-bad-arg.t
similarity index 100%
rename from t/fcm-make/28-bad-arg.t
rename to usr/t/fcm-make/28-bad-arg.t
diff --git a/t/fcm-make/29-relative-cfg.t b/usr/t/fcm-make/29-relative-cfg.t
similarity index 100%
rename from t/fcm-make/29-relative-cfg.t
rename to usr/t/fcm-make/29-relative-cfg.t
diff --git a/t/fcm-make/30-relative-cfg-in-svn.t b/usr/t/fcm-make/30-relative-cfg-in-svn.t
similarity index 100%
rename from t/fcm-make/30-relative-cfg-in-svn.t
rename to usr/t/fcm-make/30-relative-cfg-in-svn.t
diff --git a/t/fcm-make/31-relative-cfg-in-ssh.t b/usr/t/fcm-make/31-relative-cfg-in-ssh.t
similarity index 100%
rename from t/fcm-make/31-relative-cfg-in-ssh.t
rename to usr/t/fcm-make/31-relative-cfg-in-ssh.t
diff --git a/t/fcm-make/32-include-relative-cfg.t b/usr/t/fcm-make/32-include-relative-cfg.t
similarity index 100%
rename from t/fcm-make/32-include-relative-cfg.t
rename to usr/t/fcm-make/32-include-relative-cfg.t
diff --git a/t/fcm-make/33-include-relative-cfg-in-svn.t b/usr/t/fcm-make/33-include-relative-cfg-in-svn.t
similarity index 100%
rename from t/fcm-make/33-include-relative-cfg-in-svn.t
rename to usr/t/fcm-make/33-include-relative-cfg-in-svn.t
diff --git a/t/fcm-make/34-include-relative-cfg-in-ssh.t b/usr/t/fcm-make/34-include-relative-cfg-in-ssh.t
similarity index 100%
rename from t/fcm-make/34-include-relative-cfg-in-ssh.t
rename to usr/t/fcm-make/34-include-relative-cfg-in-ssh.t
diff --git a/t/fcm-make/35-include-relative-cfg-in-2-dirs.t b/usr/t/fcm-make/35-include-relative-cfg-in-2-dirs.t
similarity index 100%
rename from t/fcm-make/35-include-relative-cfg-in-2-dirs.t
rename to usr/t/fcm-make/35-include-relative-cfg-in-2-dirs.t
diff --git a/t/fcm-make/36-build-fail-cont-basic.t b/usr/t/fcm-make/36-build-fail-cont-basic.t
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic.t
rename to usr/t/fcm-make/36-build-fail-cont-basic.t
diff --git a/t/fcm-make/36-build-fail-cont-basic/fcm-make.cfg b/usr/t/fcm-make/36-build-fail-cont-basic/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/fcm-make.cfg
rename to usr/t/fcm-make/36-build-fail-cont-basic/fcm-make.cfg
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/greet_mod.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/greet_mod.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/greet_mod.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/greet_mod.f90
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/hello.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/hello.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/hello.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/hello.f90
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/hello2.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/hello2.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/hello2.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/hello2.f90
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/hello3.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/hello3.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/hello3.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/hello3.f90
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/hello4.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/hello4.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/hello4.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/hello4.f90
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/hello_sub.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/hello_sub.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/hello_sub.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/hello_sub.f90
diff --git a/t/fcm-make/36-build-fail-cont-basic/src/world_mod.f90 b/usr/t/fcm-make/36-build-fail-cont-basic/src/world_mod.f90
similarity index 100%
rename from t/fcm-make/36-build-fail-cont-basic/src/world_mod.f90
rename to usr/t/fcm-make/36-build-fail-cont-basic/src/world_mod.f90
diff --git a/t/fcm-make/37-no-such-config-file.t b/usr/t/fcm-make/37-no-such-config-file.t
similarity index 100%
rename from t/fcm-make/37-no-such-config-file.t
rename to usr/t/fcm-make/37-no-such-config-file.t
diff --git a/t/fcm-make/38-extract-inherit-set-primary.t b/usr/t/fcm-make/38-extract-inherit-set-primary.t
similarity index 100%
rename from t/fcm-make/38-extract-inherit-set-primary.t
rename to usr/t/fcm-make/38-extract-inherit-set-primary.t
diff --git a/t/fcm-make/39-build-source-with-dot.t b/usr/t/fcm-make/39-build-source-with-dot.t
similarity index 100%
rename from t/fcm-make/39-build-source-with-dot.t
rename to usr/t/fcm-make/39-build-source-with-dot.t
diff --git a/t/fcm-make/40-extract-fs-source-with-dot.t b/usr/t/fcm-make/40-extract-fs-source-with-dot.t
similarity index 100%
rename from t/fcm-make/40-extract-fs-source-with-dot.t
rename to usr/t/fcm-make/40-extract-fs-source-with-dot.t
diff --git a/t/fcm-make/41-ctx-name.t b/usr/t/fcm-make/41-ctx-name.t
similarity index 100%
rename from t/fcm-make/41-ctx-name.t
rename to usr/t/fcm-make/41-ctx-name.t
diff --git a/t/fcm-make/42-make-mirror-make2.t b/usr/t/fcm-make/42-make-mirror-make2.t
similarity index 100%
rename from t/fcm-make/42-make-mirror-make2.t
rename to usr/t/fcm-make/42-make-mirror-make2.t
diff --git a/t/fcm-make/43-ctx-name-inherit.t b/usr/t/fcm-make/43-ctx-name-inherit.t
similarity index 100%
rename from t/fcm-make/43-ctx-name-inherit.t
rename to usr/t/fcm-make/43-ctx-name-inherit.t
diff --git a/t/fcm-make/44-ctx-name-inherit-compat.t b/usr/t/fcm-make/44-ctx-name-inherit-compat.t
similarity index 100%
rename from t/fcm-make/44-ctx-name-inherit-compat.t
rename to usr/t/fcm-make/44-ctx-name-inherit-compat.t
diff --git a/t/fcm-make/45-dest-mv.t b/usr/t/fcm-make/45-dest-mv.t
similarity index 100%
rename from t/fcm-make/45-dest-mv.t
rename to usr/t/fcm-make/45-dest-mv.t
diff --git a/t/fcm-make/46-archive-mode.t b/usr/t/fcm-make/46-archive-mode.t
similarity index 100%
rename from t/fcm-make/46-archive-mode.t
rename to usr/t/fcm-make/46-archive-mode.t
diff --git a/t/fcm-make/47-build-target-modifier-ns.t b/usr/t/fcm-make/47-build-target-modifier-ns.t
similarity index 100%
rename from t/fcm-make/47-build-target-modifier-ns.t
rename to usr/t/fcm-make/47-build-target-modifier-ns.t
diff --git a/t/fcm-make/47-build-target-modifier-ns/fcm-make.cfg b/usr/t/fcm-make/47-build-target-modifier-ns/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/47-build-target-modifier-ns/fcm-make.cfg
rename to usr/t/fcm-make/47-build-target-modifier-ns/fcm-make.cfg
diff --git a/t/fcm-make/47-build-target-modifier-ns/src/greet/greet.f90 b/usr/t/fcm-make/47-build-target-modifier-ns/src/greet/greet.f90
similarity index 100%
rename from t/fcm-make/47-build-target-modifier-ns/src/greet/greet.f90
rename to usr/t/fcm-make/47-build-target-modifier-ns/src/greet/greet.f90
diff --git a/t/fcm-make/47-build-target-modifier-ns/src/greet/world.nl b/usr/t/fcm-make/47-build-target-modifier-ns/src/greet/world.nl
similarity index 100%
rename from t/fcm-make/47-build-target-modifier-ns/src/greet/world.nl
rename to usr/t/fcm-make/47-build-target-modifier-ns/src/greet/world.nl
diff --git a/t/fcm-make/47-build-target-modifier-ns/src/hello/hello.f90 b/usr/t/fcm-make/47-build-target-modifier-ns/src/hello/hello.f90
similarity index 100%
rename from t/fcm-make/47-build-target-modifier-ns/src/hello/hello.f90
rename to usr/t/fcm-make/47-build-target-modifier-ns/src/hello/hello.f90
diff --git a/t/fcm-make/47-build-target-modifier-ns/src/hello/world.nl b/usr/t/fcm-make/47-build-target-modifier-ns/src/hello/world.nl
similarity index 100%
rename from t/fcm-make/47-build-target-modifier-ns/src/hello/world.nl
rename to usr/t/fcm-make/47-build-target-modifier-ns/src/hello/world.nl
diff --git a/t/fcm-make/48-build-sha1.t b/usr/t/fcm-make/48-build-sha1.t
similarity index 100%
rename from t/fcm-make/48-build-sha1.t
rename to usr/t/fcm-make/48-build-sha1.t
diff --git a/t/fcm-make/48-build-sha1/fcm-make.cfg b/usr/t/fcm-make/48-build-sha1/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/48-build-sha1/fcm-make.cfg
rename to usr/t/fcm-make/48-build-sha1/fcm-make.cfg
diff --git a/t/fcm-make/48-build-sha1/src/hello.f90 b/usr/t/fcm-make/48-build-sha1/src/hello.f90
similarity index 100%
rename from t/fcm-make/48-build-sha1/src/hello.f90
rename to usr/t/fcm-make/48-build-sha1/src/hello.f90
diff --git a/t/fcm-make/49-build-c-more.t b/usr/t/fcm-make/49-build-c-more.t
similarity index 100%
rename from t/fcm-make/49-build-c-more.t
rename to usr/t/fcm-make/49-build-c-more.t
diff --git a/t/fcm-make/49-build-c-more/fcm-make.cfg b/usr/t/fcm-make/49-build-c-more/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/49-build-c-more/fcm-make.cfg
rename to usr/t/fcm-make/49-build-c-more/fcm-make.cfg
diff --git a/t/fcm-make/49-build-c-more/src/greet.c b/usr/t/fcm-make/49-build-c-more/src/greet.c
similarity index 100%
rename from t/fcm-make/49-build-c-more/src/greet.c
rename to usr/t/fcm-make/49-build-c-more/src/greet.c
diff --git a/t/fcm-make/49-build-c-more/src/hello.c b/usr/t/fcm-make/49-build-c-more/src/hello.c
similarity index 100%
rename from t/fcm-make/49-build-c-more/src/hello.c
rename to usr/t/fcm-make/49-build-c-more/src/hello.c
diff --git a/t/fcm-make/49-build-c-more/src/hi.c b/usr/t/fcm-make/49-build-c-more/src/hi.c
similarity index 100%
rename from t/fcm-make/49-build-c-more/src/hi.c
rename to usr/t/fcm-make/49-build-c-more/src/hi.c
diff --git a/t/fcm-make/50-build-target-dep.t b/usr/t/fcm-make/50-build-target-dep.t
similarity index 100%
rename from t/fcm-make/50-build-target-dep.t
rename to usr/t/fcm-make/50-build-target-dep.t
diff --git a/t/fcm-make/50-build-target-dep/fcm-make.cfg b/usr/t/fcm-make/50-build-target-dep/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/50-build-target-dep/fcm-make.cfg
rename to usr/t/fcm-make/50-build-target-dep/fcm-make.cfg
diff --git a/t/fcm-make/50-build-target-dep/src/greet.f90 b/usr/t/fcm-make/50-build-target-dep/src/greet.f90
similarity index 100%
rename from t/fcm-make/50-build-target-dep/src/greet.f90
rename to usr/t/fcm-make/50-build-target-dep/src/greet.f90
diff --git a/t/fcm-make/50-build-target-dep/src/greet_world.f90 b/usr/t/fcm-make/50-build-target-dep/src/greet_world.f90
similarity index 100%
rename from t/fcm-make/50-build-target-dep/src/greet_world.f90
rename to usr/t/fcm-make/50-build-target-dep/src/greet_world.f90
diff --git a/t/fcm-make/51-build-target-no-dep.t b/usr/t/fcm-make/51-build-target-no-dep.t
similarity index 100%
rename from t/fcm-make/51-build-target-no-dep.t
rename to usr/t/fcm-make/51-build-target-no-dep.t
diff --git a/t/fcm-make/51-build-target-no-dep/fcm-make.cfg b/usr/t/fcm-make/51-build-target-no-dep/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/51-build-target-no-dep/fcm-make.cfg
rename to usr/t/fcm-make/51-build-target-no-dep/fcm-make.cfg
diff --git a/t/fcm-make/51-build-target-no-dep/src/greet.f90 b/usr/t/fcm-make/51-build-target-no-dep/src/greet.f90
similarity index 100%
rename from t/fcm-make/51-build-target-no-dep/src/greet.f90
rename to usr/t/fcm-make/51-build-target-no-dep/src/greet.f90
diff --git a/t/fcm-make/51-build-target-no-dep/src/greet_mod.f90 b/usr/t/fcm-make/51-build-target-no-dep/src/greet_mod.f90
similarity index 100%
rename from t/fcm-make/51-build-target-no-dep/src/greet_mod.f90
rename to usr/t/fcm-make/51-build-target-no-dep/src/greet_mod.f90
diff --git a/t/fcm-make/51-build-target-no-dep/src/greet_world.f90 b/usr/t/fcm-make/51-build-target-no-dep/src/greet_world.f90
similarity index 100%
rename from t/fcm-make/51-build-target-no-dep/src/greet_world.f90
rename to usr/t/fcm-make/51-build-target-no-dep/src/greet_world.f90
diff --git a/t/fcm-make/51-build-target-no-dep/src2/hello_mod.f90 b/usr/t/fcm-make/51-build-target-no-dep/src2/hello_mod.f90
similarity index 100%
rename from t/fcm-make/51-build-target-no-dep/src2/hello_mod.f90
rename to usr/t/fcm-make/51-build-target-no-dep/src2/hello_mod.f90
diff --git a/t/fcm-make/52-require-version.t b/usr/t/fcm-make/52-require-version.t
similarity index 100%
rename from t/fcm-make/52-require-version.t
rename to usr/t/fcm-make/52-require-version.t
diff --git a/t/fcm-make/53-extract-conflict-incr.t b/usr/t/fcm-make/53-extract-conflict-incr.t
similarity index 100%
rename from t/fcm-make/53-extract-conflict-incr.t
rename to usr/t/fcm-make/53-extract-conflict-incr.t
diff --git a/t/fcm-make/54-build-ignore-missing-dep-ns.t b/usr/t/fcm-make/54-build-ignore-missing-dep-ns.t
similarity index 100%
rename from t/fcm-make/54-build-ignore-missing-dep-ns.t
rename to usr/t/fcm-make/54-build-ignore-missing-dep-ns.t
diff --git a/t/fcm-make/54-build-ignore-missing-dep-ns/fcm-make.cfg b/usr/t/fcm-make/54-build-ignore-missing-dep-ns/fcm-make.cfg
similarity index 100%
rename from t/fcm-make/54-build-ignore-missing-dep-ns/fcm-make.cfg
rename to usr/t/fcm-make/54-build-ignore-missing-dep-ns/fcm-make.cfg
diff --git a/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet.f90 b/usr/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet.f90
similarity index 100%
rename from t/fcm-make/54-build-ignore-missing-dep-ns/src/greet.f90
rename to usr/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet.f90
diff --git a/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_mod.f90 b/usr/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_mod.f90
similarity index 100%
rename from t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_mod.f90
rename to usr/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_mod.f90
diff --git a/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_world.f90 b/usr/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_world.f90
similarity index 100%
rename from t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_world.f90
rename to usr/t/fcm-make/54-build-ignore-missing-dep-ns/src/greet_world.f90
diff --git a/t/fcm-make/54-build-ignore-missing-dep-ns/src2/hello_mod.f90 b/usr/t/fcm-make/54-build-ignore-missing-dep-ns/src2/hello_mod.f90
similarity index 100%
rename from t/fcm-make/54-build-ignore-missing-dep-ns/src2/hello_mod.f90
rename to usr/t/fcm-make/54-build-ignore-missing-dep-ns/src2/hello_mod.f90
diff --git a/t/fcm-make/test_header b/usr/t/fcm-make/test_header
similarity index 100%
rename from t/fcm-make/test_header
rename to usr/t/fcm-make/test_header
diff --git a/t/fcm-merge/00-simple.t b/usr/t/fcm-merge/00-simple.t
similarity index 100%
rename from t/fcm-merge/00-simple.t
rename to usr/t/fcm-merge/00-simple.t
diff --git a/t/fcm-merge/01-complex.t b/usr/t/fcm-merge/01-complex.t
similarity index 100%
rename from t/fcm-merge/01-complex.t
rename to usr/t/fcm-merge/01-complex.t
diff --git a/t/fcm-merge/02-reverse.t b/usr/t/fcm-merge/02-reverse.t
similarity index 100%
rename from t/fcm-merge/02-reverse.t
rename to usr/t/fcm-merge/02-reverse.t
diff --git a/t/fcm-merge/test_header b/usr/t/fcm-merge/test_header
similarity index 100%
rename from t/fcm-merge/test_header
rename to usr/t/fcm-merge/test_header
diff --git a/t/fcm-recover-svn-repos/00-basic.t b/usr/t/fcm-recover-svn-repos/00-basic.t
similarity index 100%
rename from t/fcm-recover-svn-repos/00-basic.t
rename to usr/t/fcm-recover-svn-repos/00-basic.t
diff --git a/t/fcm-recover-svn-repos/test_header b/usr/t/fcm-recover-svn-repos/test_header
similarity index 100%
rename from t/fcm-recover-svn-repos/test_header
rename to usr/t/fcm-recover-svn-repos/test_header
diff --git a/t/fcm-status/00-simple.t b/usr/t/fcm-status/00-simple.t
similarity index 100%
rename from t/fcm-status/00-simple.t
rename to usr/t/fcm-status/00-simple.t
diff --git a/t/fcm-status/test_header b/usr/t/fcm-status/test_header
similarity index 100%
rename from t/fcm-status/test_header
rename to usr/t/fcm-status/test_header
diff --git a/t/fcm-switch/00-simple.t b/usr/t/fcm-switch/00-simple.t
similarity index 100%
rename from t/fcm-switch/00-simple.t
rename to usr/t/fcm-switch/00-simple.t
diff --git a/t/fcm-switch/01-subtree.t b/usr/t/fcm-switch/01-subtree.t
similarity index 100%
rename from t/fcm-switch/01-subtree.t
rename to usr/t/fcm-switch/01-subtree.t
diff --git a/t/fcm-switch/test_header b/usr/t/fcm-switch/test_header
similarity index 100%
rename from t/fcm-switch/test_header
rename to usr/t/fcm-switch/test_header
diff --git a/t/fcm-update/00-simple.t b/usr/t/fcm-update/00-simple.t
similarity index 100%
rename from t/fcm-update/00-simple.t
rename to usr/t/fcm-update/00-simple.t
diff --git a/t/fcm-update/01-subtree.t b/usr/t/fcm-update/01-subtree.t
similarity index 100%
rename from t/fcm-update/01-subtree.t
rename to usr/t/fcm-update/01-subtree.t
diff --git a/t/fcm-update/test_header b/usr/t/fcm-update/test_header
similarity index 100%
rename from t/fcm-update/test_header
rename to usr/t/fcm-update/test_header
diff --git a/t/lib/bash/svn_test_header b/usr/t/lib/bash/svn_test_header
similarity index 100%
rename from t/lib/bash/svn_test_header
rename to usr/t/lib/bash/svn_test_header
diff --git a/t/lib/bash/test_header b/usr/t/lib/bash/test_header
similarity index 100%
rename from t/lib/bash/test_header
rename to usr/t/lib/bash/test_header
diff --git a/t/svn-hooks/00-pre-revprop-change.t b/usr/t/svn-hooks/00-pre-revprop-change.t
similarity index 100%
rename from t/svn-hooks/00-pre-revprop-change.t
rename to usr/t/svn-hooks/00-pre-revprop-change.t
diff --git a/t/svn-hooks/01-post-revprop-change-bg.t b/usr/t/svn-hooks/01-post-revprop-change-bg.t
similarity index 100%
rename from t/svn-hooks/01-post-revprop-change-bg.t
rename to usr/t/svn-hooks/01-post-revprop-change-bg.t
diff --git a/t/svn-hooks/02-pre-commit.t b/usr/t/svn-hooks/02-pre-commit.t
similarity index 100%
rename from t/svn-hooks/02-pre-commit.t
rename to usr/t/svn-hooks/02-pre-commit.t
diff --git a/t/svn-hooks/03-post-commit-bg.t b/usr/t/svn-hooks/03-post-commit-bg.t
similarity index 100%
rename from t/svn-hooks/03-post-commit-bg.t
rename to usr/t/svn-hooks/03-post-commit-bg.t
diff --git a/t/svn-hooks/04-svnperms.t b/usr/t/svn-hooks/04-svnperms.t
similarity index 100%
rename from t/svn-hooks/04-svnperms.t
rename to usr/t/svn-hooks/04-svnperms.t
diff --git a/t/svn-hooks/test_header b/usr/t/svn-hooks/test_header
similarity index 100%
rename from t/svn-hooks/test_header
rename to usr/t/svn-hooks/test_header
diff --git a/t/svn-hooks/test_header_more b/usr/t/svn-hooks/test_header_more
similarity index 100%
rename from t/svn-hooks/test_header_more
rename to usr/t/svn-hooks/test_header_more
diff --git a/t/svn-username/00-branch.t b/usr/t/svn-username/00-branch.t
similarity index 100%
rename from t/svn-username/00-branch.t
rename to usr/t/svn-username/00-branch.t
diff --git a/t/svn-username/test_header b/usr/t/svn-username/test_header
similarity index 100%
rename from t/svn-username/test_header
rename to usr/t/svn-username/test_header
diff --git a/test/compare_results_fcm1 b/usr/test/compare_results_fcm1
similarity index 100%
rename from test/compare_results_fcm1
rename to usr/test/compare_results_fcm1
diff --git a/test/compare_results_fcm2 b/usr/test/compare_results_fcm2
similarity index 100%
rename from test/compare_results_fcm2
rename to usr/test/compare_results_fcm2
diff --git a/test/compare_times_fcm1-2 b/usr/test/compare_times_fcm1-2
similarity index 100%
rename from test/compare_times_fcm1-2
rename to usr/test/compare_times_fcm1-2
diff --git a/test/create_hpc_batch_script b/usr/test/create_hpc_batch_script
similarity index 100%
rename from test/create_hpc_batch_script
rename to usr/test/create_hpc_batch_script
diff --git a/test/create_repos b/usr/test/create_repos
similarity index 100%
rename from test/create_repos
rename to usr/test/create_repos
diff --git a/test/get_hpc_results b/usr/test/get_hpc_results
similarity index 100%
rename from test/get_hpc_results
rename to usr/test/get_hpc_results
diff --git a/test/perform_test_fcm1 b/usr/test/perform_test_fcm1
similarity index 100%
rename from test/perform_test_fcm1
rename to usr/test/perform_test_fcm1
diff --git a/test/perform_test_fcm2 b/usr/test/perform_test_fcm2
similarity index 100%
rename from test/perform_test_fcm2
rename to usr/test/perform_test_fcm2
diff --git a/test/report_hpc_results b/usr/test/report_hpc_results
similarity index 100%
rename from test/report_hpc_results
rename to usr/test/report_hpc_results
diff --git a/test/repos/add_subroutine/hello.F90 b/usr/test/repos/add_subroutine/hello.F90
similarity index 100%
rename from test/repos/add_subroutine/hello.F90
rename to usr/test/repos/add_subroutine/hello.F90
diff --git a/test/repos/add_subroutine/hello.F90.add_lines b/usr/test/repos/add_subroutine/hello.F90.add_lines
similarity index 100%
rename from test/repos/add_subroutine/hello.F90.add_lines
rename to usr/test/repos/add_subroutine/hello.F90.add_lines
diff --git a/test/repos/add_subroutine/hello_sub2.f90 b/usr/test/repos/add_subroutine/hello_sub2.f90
similarity index 100%
rename from test/repos/add_subroutine/hello_sub2.f90
rename to usr/test/repos/add_subroutine/hello_sub2.f90
diff --git a/test/repos/cyclic_dependency/hello.F90 b/usr/test/repos/cyclic_dependency/hello.F90
similarity index 100%
rename from test/repos/cyclic_dependency/hello.F90
rename to usr/test/repos/cyclic_dependency/hello.F90
diff --git a/test/repos/cyclic_dependency/hello_constants.f90.fail b/usr/test/repos/cyclic_dependency/hello_constants.f90.fail
similarity index 100%
rename from test/repos/cyclic_dependency/hello_constants.f90.fail
rename to usr/test/repos/cyclic_dependency/hello_constants.f90.fail
diff --git a/test/repos/cyclic_dependency/hello_constants.f90.ok b/usr/test/repos/cyclic_dependency/hello_constants.f90.ok
similarity index 100%
rename from test/repos/cyclic_dependency/hello_constants.f90.ok
rename to usr/test/repos/cyclic_dependency/hello_constants.f90.ok
diff --git a/test/repos/cyclic_dependency/hello_sub2.f90 b/usr/test/repos/cyclic_dependency/hello_sub2.f90
similarity index 100%
rename from test/repos/cyclic_dependency/hello_sub2.f90
rename to usr/test/repos/cyclic_dependency/hello_sub2.f90
diff --git a/test/repos/trunk/blockdata/hello_blockdata.F90 b/usr/test/repos/trunk/blockdata/hello_blockdata.F90
similarity index 100%
rename from test/repos/trunk/blockdata/hello_blockdata.F90
rename to usr/test/repos/trunk/blockdata/hello_blockdata.F90
diff --git a/test/repos/trunk/cfg/fcm1_add_directory.cfg b/usr/test/repos/trunk/cfg/fcm1_add_directory.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_add_directory.cfg
rename to usr/test/repos/trunk/cfg/fcm1_add_directory.cfg
diff --git a/test/repos/trunk/cfg/fcm1_add_directory_expsrc.cfg b/usr/test/repos/trunk/cfg/fcm1_add_directory_expsrc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_add_directory_expsrc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_add_directory_expsrc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_add_file.cfg b/usr/test/repos/trunk/cfg/fcm1_add_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_add_file.cfg
rename to usr/test/repos/trunk/cfg/fcm1_add_file.cfg
diff --git a/test/repos/trunk/cfg/fcm1_add_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_add_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_add_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_add_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_base.cfg b/usr/test/repos/trunk/cfg/fcm1_base.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_base.cfg
rename to usr/test/repos/trunk/cfg/fcm1_base.cfg
diff --git a/test/repos/trunk/cfg/fcm1_base_inc.cfg b/usr/test/repos/trunk/cfg/fcm1_base_inc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_base_inc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_base_inc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_clash.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_clash.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_clash.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_clash.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge_conflict_fail.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge_conflict_fail.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge_conflict_fail.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge_conflict_fail.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge_conflict_override.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge_conflict_override.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge_conflict_override.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge_conflict_override.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge_inherit_wrong_include.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge_inherit_wrong_include.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge_inherit_wrong_include.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge_inherit_wrong_include.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge_wcopies.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge_wcopies.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge_wcopies.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge_wcopies.cfg
diff --git a/test/repos/trunk/cfg/fcm1_branches_merge_wcopy.cfg b/usr/test/repos/trunk/cfg/fcm1_branches_merge_wcopy.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_branches_merge_wcopy.cfg
rename to usr/test/repos/trunk/cfg/fcm1_branches_merge_wcopy.cfg
diff --git a/test/repos/trunk/cfg/fcm1_cflags.cfg b/usr/test/repos/trunk/cfg/fcm1_cflags.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_cflags.cfg
rename to usr/test/repos/trunk/cfg/fcm1_cflags.cfg
diff --git a/test/repos/trunk/cfg/fcm1_change_src_type.cfg b/usr/test/repos/trunk/cfg/fcm1_change_src_type.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_change_src_type.cfg
rename to usr/test/repos/trunk/cfg/fcm1_change_src_type.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_directory.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_directory.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_directory.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_directory.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_directory_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_directory_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_directory_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_directory_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_file.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_file.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_file.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_inc_file.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_inc_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_inc_file.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_inc_file.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_inc_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_inc_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_inc_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_inc_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_inc_file_inherit_force.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_inc_file_inherit_force.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_inc_file_inherit_force.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_inc_file_inherit_force.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_pp_file.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_pp_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_pp_file.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_pp_file.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_pp_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_pp_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_pp_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_pp_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_ppinc_file.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_ppinc_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_ppinc_file.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_ppinc_file.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit_force.cfg b/usr/test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit_force.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit_force.cfg
rename to usr/test/repos/trunk/cfg/fcm1_delete_ppinc_file_inherit_force.cfg
diff --git a/test/repos/trunk/cfg/fcm1_duplicate_target.cfg b/usr/test/repos/trunk/cfg/fcm1_duplicate_target.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_duplicate_target.cfg
rename to usr/test/repos/trunk/cfg/fcm1_duplicate_target.cfg
diff --git a/test/repos/trunk/cfg/fcm1_exclude_dependency.cfg b/usr/test/repos/trunk/cfg/fcm1_exclude_dependency.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_exclude_dependency.cfg
rename to usr/test/repos/trunk/cfg/fcm1_exclude_dependency.cfg
diff --git a/test/repos/trunk/cfg/fcm1_exe_permissions.cfg b/usr/test/repos/trunk/cfg/fcm1_exe_permissions.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_exe_permissions.cfg
rename to usr/test/repos/trunk/cfg/fcm1_exe_permissions.cfg
diff --git a/test/repos/trunk/cfg/fcm1_exe_rename.cfg b/usr/test/repos/trunk/cfg/fcm1_exe_rename.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_exe_rename.cfg
rename to usr/test/repos/trunk/cfg/fcm1_exe_rename.cfg
diff --git a/test/repos/trunk/cfg/fcm1_fc.cfg b/usr/test/repos/trunk/cfg/fcm1_fc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_fc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_fc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_fflags1.cfg b/usr/test/repos/trunk/cfg/fcm1_fflags1.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_fflags1.cfg
rename to usr/test/repos/trunk/cfg/fcm1_fflags1.cfg
diff --git a/test/repos/trunk/cfg/fcm1_fflags2.cfg b/usr/test/repos/trunk/cfg/fcm1_fflags2.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_fflags2.cfg
rename to usr/test/repos/trunk/cfg/fcm1_fflags2.cfg
diff --git a/test/repos/trunk/cfg/fcm1_fflags_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_fflags_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_fflags_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_fflags_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_inc_devnull.cfg b/usr/test/repos/trunk/cfg/fcm1_inc_devnull.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_inc_devnull.cfg
rename to usr/test/repos/trunk/cfg/fcm1_inc_devnull.cfg
diff --git a/test/repos/trunk/cfg/fcm1_inherit_invalid_path.cfg b/usr/test/repos/trunk/cfg/fcm1_inherit_invalid_path.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_inherit_invalid_path.cfg
rename to usr/test/repos/trunk/cfg/fcm1_inherit_invalid_path.cfg
diff --git a/test/repos/trunk/cfg/fcm1_inherit_target.cfg b/usr/test/repos/trunk/cfg/fcm1_inherit_target.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_inherit_target.cfg
rename to usr/test/repos/trunk/cfg/fcm1_inherit_target.cfg
diff --git a/test/repos/trunk/cfg/fcm1_invalid_base_url.cfg b/usr/test/repos/trunk/cfg/fcm1_invalid_base_url.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_invalid_base_url.cfg
rename to usr/test/repos/trunk/cfg/fcm1_invalid_base_url.cfg
diff --git a/test/repos/trunk/cfg/fcm1_invalid_branch_url.cfg b/usr/test/repos/trunk/cfg/fcm1_invalid_branch_url.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_invalid_branch_url.cfg
rename to usr/test/repos/trunk/cfg/fcm1_invalid_branch_url.cfg
diff --git a/test/repos/trunk/cfg/fcm1_invalid_inc.cfg b/usr/test/repos/trunk/cfg/fcm1_invalid_inc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_invalid_inc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_invalid_inc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_invalid_namespace.cfg b/usr/test/repos/trunk/cfg/fcm1_invalid_namespace.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_invalid_namespace.cfg
rename to usr/test/repos/trunk/cfg/fcm1_invalid_namespace.cfg
diff --git a/test/repos/trunk/cfg/fcm1_invalid_variable.cfg b/usr/test/repos/trunk/cfg/fcm1_invalid_variable.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_invalid_variable.cfg
rename to usr/test/repos/trunk/cfg/fcm1_invalid_variable.cfg
diff --git a/test/repos/trunk/cfg/fcm1_ld.cfg b/usr/test/repos/trunk/cfg/fcm1_ld.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_ld.cfg
rename to usr/test/repos/trunk/cfg/fcm1_ld.cfg
diff --git a/test/repos/trunk/cfg/fcm1_library.cfg b/usr/test/repos/trunk/cfg/fcm1_library.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_library.cfg
rename to usr/test/repos/trunk/cfg/fcm1_library.cfg
diff --git a/test/repos/trunk/cfg/fcm1_library_rename.cfg b/usr/test/repos/trunk/cfg/fcm1_library_rename.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_library_rename.cfg
rename to usr/test/repos/trunk/cfg/fcm1_library_rename.cfg
diff --git a/test/repos/trunk/cfg/fcm1_mirror.cfg b/usr/test/repos/trunk/cfg/fcm1_mirror.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_mirror.cfg
rename to usr/test/repos/trunk/cfg/fcm1_mirror.cfg
diff --git a/test/repos/trunk/cfg/fcm1_mirror_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_mirror_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_mirror_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_mirror_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_modify_subroutine_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_modify_subroutine_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_modify_subroutine_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_modify_subroutine_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_modify_subroutine_interface_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_modify_subroutine_interface_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_modify_subroutine_interface_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_modify_subroutine_interface_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_multi_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_multi_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_multi_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_multi_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_no_dep.cfg b/usr/test/repos/trunk/cfg/fcm1_no_dep.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_no_dep.cfg
rename to usr/test/repos/trunk/cfg/fcm1_no_dep.cfg
diff --git a/test/repos/trunk/cfg/fcm1_ops.cfg b/usr/test/repos/trunk/cfg/fcm1_ops.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_ops.cfg
rename to usr/test/repos/trunk/cfg/fcm1_ops.cfg
diff --git a/test/repos/trunk/cfg/fcm1_postproc_hpc.cfg b/usr/test/repos/trunk/cfg/fcm1_postproc_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_postproc_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_postproc_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_change_blockdata.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_change_blockdata.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_change_blockdata.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_change_blockdata.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_change_dependency.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_change_dependency.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_change_dependency.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_change_dependency.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_change_include.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_change_include.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_change_include.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_change_include.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_change_include_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_change_include_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_change_include_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_change_include_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_empty_subroutine.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_empty_subroutine.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_empty_subroutine.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_empty_subroutine.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit_force.cfg b/usr/test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit_force.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit_force.cfg
rename to usr/test/repos/trunk/cfg/fcm1_pp_empty_subroutine_inherit_force.cfg
diff --git a/test/repos/trunk/cfg/fcm1_revmatch_false.cfg b/usr/test/repos/trunk/cfg/fcm1_revmatch_false.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_revmatch_false.cfg
rename to usr/test/repos/trunk/cfg/fcm1_revmatch_false.cfg
diff --git a/test/repos/trunk/cfg/fcm1_revmatch_true.cfg b/usr/test/repos/trunk/cfg/fcm1_revmatch_true.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_revmatch_true.cfg
rename to usr/test/repos/trunk/cfg/fcm1_revmatch_true.cfg
diff --git a/test/repos/trunk/cfg/fcm1_sps.cfg b/usr/test/repos/trunk/cfg/fcm1_sps.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_sps.cfg
rename to usr/test/repos/trunk/cfg/fcm1_sps.cfg
diff --git a/test/repos/trunk/cfg/fcm1_suite.cfg b/usr/test/repos/trunk/cfg/fcm1_suite.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_suite.cfg
rename to usr/test/repos/trunk/cfg/fcm1_suite.cfg
diff --git a/test/repos/trunk/cfg/fcm1_symbolic_link.cfg b/usr/test/repos/trunk/cfg/fcm1_symbolic_link.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_symbolic_link.cfg
rename to usr/test/repos/trunk/cfg/fcm1_symbolic_link.cfg
diff --git a/test/repos/trunk/cfg/fcm1_um.cfg b/usr/test/repos/trunk/cfg/fcm1_um.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_um.cfg
rename to usr/test/repos/trunk/cfg/fcm1_um.cfg
diff --git a/test/repos/trunk/cfg/fcm1_um_hpc.cfg b/usr/test/repos/trunk/cfg/fcm1_um_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_um_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_um_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_um_inherit.cfg b/usr/test/repos/trunk/cfg/fcm1_um_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_um_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm1_um_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm1_um_inherit_hpc.cfg b/usr/test/repos/trunk/cfg/fcm1_um_inherit_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_um_inherit_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_um_inherit_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm1_var.cfg b/usr/test/repos/trunk/cfg/fcm1_var.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_var.cfg
rename to usr/test/repos/trunk/cfg/fcm1_var.cfg
diff --git a/test/repos/trunk/cfg/fcm1_var_hpc.cfg b/usr/test/repos/trunk/cfg/fcm1_var_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm1_var_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm1_var_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_add_directory_expsrc.cfg b/usr/test/repos/trunk/cfg/fcm2_add_directory_expsrc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_add_directory_expsrc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_add_directory_expsrc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_add_file.cfg b/usr/test/repos/trunk/cfg/fcm2_add_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_add_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_add_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_add_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_add_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_add_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_add_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_base.cfg b/usr/test/repos/trunk/cfg/fcm2_base.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_base.cfg
rename to usr/test/repos/trunk/cfg/fcm2_base.cfg
diff --git a/test/repos/trunk/cfg/fcm2_base_inc.cfg b/usr/test/repos/trunk/cfg/fcm2_base_inc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_base_inc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_base_inc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_base_inc2.cfg b/usr/test/repos/trunk/cfg/fcm2_base_inc2.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_base_inc2.cfg
rename to usr/test/repos/trunk/cfg/fcm2_base_inc2.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_clash.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_clash.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_clash.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_clash.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_merge.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_merge.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_merge.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_merge.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_merge_duplicate.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_merge_duplicate.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_merge_duplicate.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_merge_duplicate.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_merge_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_merge_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_merge_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_merge_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_merge_inherit_wrong_include.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_merge_inherit_wrong_include.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_merge_inherit_wrong_include.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_merge_inherit_wrong_include.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_merge_wcopies.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_merge_wcopies.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_merge_wcopies.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_merge_wcopies.cfg
diff --git a/test/repos/trunk/cfg/fcm2_branches_merge_wcopy.cfg b/usr/test/repos/trunk/cfg/fcm2_branches_merge_wcopy.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_branches_merge_wcopy.cfg
rename to usr/test/repos/trunk/cfg/fcm2_branches_merge_wcopy.cfg
diff --git a/test/repos/trunk/cfg/fcm2_cflags.cfg b/usr/test/repos/trunk/cfg/fcm2_cflags.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_cflags.cfg
rename to usr/test/repos/trunk/cfg/fcm2_cflags.cfg
diff --git a/test/repos/trunk/cfg/fcm2_change_variable.cfg b/usr/test/repos/trunk/cfg/fcm2_change_variable.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_change_variable.cfg
rename to usr/test/repos/trunk/cfg/fcm2_change_variable.cfg
diff --git a/test/repos/trunk/cfg/fcm2_cyclic_dep_fail.cfg b/usr/test/repos/trunk/cfg/fcm2_cyclic_dep_fail.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_cyclic_dep_fail.cfg
rename to usr/test/repos/trunk/cfg/fcm2_cyclic_dep_fail.cfg
diff --git a/test/repos/trunk/cfg/fcm2_cyclic_dep_ok.cfg b/usr/test/repos/trunk/cfg/fcm2_cyclic_dep_ok.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_cyclic_dep_ok.cfg
rename to usr/test/repos/trunk/cfg/fcm2_cyclic_dep_ok.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_directory.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_directory.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_directory.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_directory.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_directory_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_directory_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_directory_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_directory_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_file.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_inc_file.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_inc_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_inc_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_inc_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_inc_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_inc_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_inc_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_inc_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_inc_file_inherit_force.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_inc_file_inherit_force.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_inc_file_inherit_force.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_inc_file_inherit_force.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_pp_file.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_pp_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_pp_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_pp_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_pp_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_pp_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_pp_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_pp_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_ppinc_file.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_ppinc_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_ppinc_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_ppinc_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit_force.cfg b/usr/test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit_force.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit_force.cfg
rename to usr/test/repos/trunk/cfg/fcm2_delete_ppinc_file_inherit_force.cfg
diff --git a/test/repos/trunk/cfg/fcm2_dep_o.cfg b/usr/test/repos/trunk/cfg/fcm2_dep_o.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_dep_o.cfg
rename to usr/test/repos/trunk/cfg/fcm2_dep_o.cfg
diff --git a/test/repos/trunk/cfg/fcm2_dep_o_all.cfg b/usr/test/repos/trunk/cfg/fcm2_dep_o_all.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_dep_o_all.cfg
rename to usr/test/repos/trunk/cfg/fcm2_dep_o_all.cfg
diff --git a/test/repos/trunk/cfg/fcm2_dep_o_invalid.cfg b/usr/test/repos/trunk/cfg/fcm2_dep_o_invalid.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_dep_o_invalid.cfg
rename to usr/test/repos/trunk/cfg/fcm2_dep_o_invalid.cfg
diff --git a/test/repos/trunk/cfg/fcm2_duplicate_target.cfg b/usr/test/repos/trunk/cfg/fcm2_duplicate_target.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_duplicate_target.cfg
rename to usr/test/repos/trunk/cfg/fcm2_duplicate_target.cfg
diff --git a/test/repos/trunk/cfg/fcm2_exclude_dependency.cfg b/usr/test/repos/trunk/cfg/fcm2_exclude_dependency.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_exclude_dependency.cfg
rename to usr/test/repos/trunk/cfg/fcm2_exclude_dependency.cfg
diff --git a/test/repos/trunk/cfg/fcm2_exe_permissions.cfg b/usr/test/repos/trunk/cfg/fcm2_exe_permissions.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_exe_permissions.cfg
rename to usr/test/repos/trunk/cfg/fcm2_exe_permissions.cfg
diff --git a/test/repos/trunk/cfg/fcm2_exe_rename.cfg b/usr/test/repos/trunk/cfg/fcm2_exe_rename.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_exe_rename.cfg
rename to usr/test/repos/trunk/cfg/fcm2_exe_rename.cfg
diff --git a/test/repos/trunk/cfg/fcm2_extract_path_excl_no_ns.cfg b/usr/test/repos/trunk/cfg/fcm2_extract_path_excl_no_ns.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_extract_path_excl_no_ns.cfg
rename to usr/test/repos/trunk/cfg/fcm2_extract_path_excl_no_ns.cfg
diff --git a/test/repos/trunk/cfg/fcm2_fc.cfg b/usr/test/repos/trunk/cfg/fcm2_fc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_fc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_fc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_fflags1.cfg b/usr/test/repos/trunk/cfg/fcm2_fflags1.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_fflags1.cfg
rename to usr/test/repos/trunk/cfg/fcm2_fflags1.cfg
diff --git a/test/repos/trunk/cfg/fcm2_fflags2.cfg b/usr/test/repos/trunk/cfg/fcm2_fflags2.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_fflags2.cfg
rename to usr/test/repos/trunk/cfg/fcm2_fflags2.cfg
diff --git a/test/repos/trunk/cfg/fcm2_fflags_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_fflags_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_fflags_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_fflags_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_flag-output.cfg b/usr/test/repos/trunk/cfg/fcm2_flag-output.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_flag-output.cfg
rename to usr/test/repos/trunk/cfg/fcm2_flag-output.cfg
diff --git a/test/repos/trunk/cfg/fcm2_inc_devnull.cfg b/usr/test/repos/trunk/cfg/fcm2_inc_devnull.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_inc_devnull.cfg
rename to usr/test/repos/trunk/cfg/fcm2_inc_devnull.cfg
diff --git a/test/repos/trunk/cfg/fcm2_inherit_invalid_path.cfg b/usr/test/repos/trunk/cfg/fcm2_inherit_invalid_path.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_inherit_invalid_path.cfg
rename to usr/test/repos/trunk/cfg/fcm2_inherit_invalid_path.cfg
diff --git a/test/repos/trunk/cfg/fcm2_inherit_redefine_fail.cfg b/usr/test/repos/trunk/cfg/fcm2_inherit_redefine_fail.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_inherit_redefine_fail.cfg
rename to usr/test/repos/trunk/cfg/fcm2_inherit_redefine_fail.cfg
diff --git a/test/repos/trunk/cfg/fcm2_inherit_redefine_ok.cfg b/usr/test/repos/trunk/cfg/fcm2_inherit_redefine_ok.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_inherit_redefine_ok.cfg
rename to usr/test/repos/trunk/cfg/fcm2_inherit_redefine_ok.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_base_url.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_base_url.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_base_url.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_base_url.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_branch_url.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_branch_url.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_branch_url.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_branch_url.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_branch_url2.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_branch_url2.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_branch_url2.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_branch_url2.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_inc.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_inc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_inc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_inc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_label.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_label.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_label.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_label.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_modifier.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_modifier.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_modifier.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_modifier.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_modifiers.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_modifiers.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_modifiers.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_modifiers.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_namespace.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_namespace.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_namespace.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_namespace.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_namespace2.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_namespace2.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_namespace2.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_namespace2.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_target.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_target.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_target.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_target.cfg
diff --git a/test/repos/trunk/cfg/fcm2_invalid_variable.cfg b/usr/test/repos/trunk/cfg/fcm2_invalid_variable.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_invalid_variable.cfg
rename to usr/test/repos/trunk/cfg/fcm2_invalid_variable.cfg
diff --git a/test/repos/trunk/cfg/fcm2_library.cfg b/usr/test/repos/trunk/cfg/fcm2_library.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_library.cfg
rename to usr/test/repos/trunk/cfg/fcm2_library.cfg
diff --git a/test/repos/trunk/cfg/fcm2_library_rename.cfg b/usr/test/repos/trunk/cfg/fcm2_library_rename.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_library_rename.cfg
rename to usr/test/repos/trunk/cfg/fcm2_library_rename.cfg
diff --git a/test/repos/trunk/cfg/fcm2_mirror.cfg b/usr/test/repos/trunk/cfg/fcm2_mirror.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_mirror.cfg
rename to usr/test/repos/trunk/cfg/fcm2_mirror.cfg
diff --git a/test/repos/trunk/cfg/fcm2_mirror_after_pp.cfg b/usr/test/repos/trunk/cfg/fcm2_mirror_after_pp.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_mirror_after_pp.cfg
rename to usr/test/repos/trunk/cfg/fcm2_mirror_after_pp.cfg
diff --git a/test/repos/trunk/cfg/fcm2_mirror_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_mirror_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_mirror_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_mirror_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_mirror_inherit_fflags.cfg b/usr/test/repos/trunk/cfg/fcm2_mirror_inherit_fflags.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_mirror_inherit_fflags.cfg
rename to usr/test/repos/trunk/cfg/fcm2_mirror_inherit_fflags.cfg
diff --git a/test/repos/trunk/cfg/fcm2_mirror_inherit_notarget.cfg b/usr/test/repos/trunk/cfg/fcm2_mirror_inherit_notarget.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_mirror_inherit_notarget.cfg
rename to usr/test/repos/trunk/cfg/fcm2_mirror_inherit_notarget.cfg
diff --git a/test/repos/trunk/cfg/fcm2_modify_subroutine_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_modify_subroutine_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_modify_subroutine_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_modify_subroutine_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_modify_subroutine_interface_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_modify_subroutine_interface_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_modify_subroutine_interface_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_modify_subroutine_interface_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_multi_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_multi_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_multi_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_multi_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_multiple_build.cfg b/usr/test/repos/trunk/cfg/fcm2_multiple_build.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_multiple_build.cfg
rename to usr/test/repos/trunk/cfg/fcm2_multiple_build.cfg
diff --git a/test/repos/trunk/cfg/fcm2_multiple_build_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_multiple_build_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_multiple_build_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_multiple_build_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_multiple_pp-build.cfg b/usr/test/repos/trunk/cfg/fcm2_multiple_pp-build.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_multiple_pp-build.cfg
rename to usr/test/repos/trunk/cfg/fcm2_multiple_pp-build.cfg
diff --git a/test/repos/trunk/cfg/fcm2_multiple_pp-build_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_multiple_pp-build_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_multiple_pp-build_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_multiple_pp-build_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_no_dep.cfg b/usr/test/repos/trunk/cfg/fcm2_no_dep.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_no_dep.cfg
rename to usr/test/repos/trunk/cfg/fcm2_no_dep.cfg
diff --git a/test/repos/trunk/cfg/fcm2_ns-dep_o.cfg b/usr/test/repos/trunk/cfg/fcm2_ns-dep_o.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_ns-dep_o.cfg
rename to usr/test/repos/trunk/cfg/fcm2_ns-dep_o.cfg
diff --git a/test/repos/trunk/cfg/fcm2_ns-dep_o_all.cfg b/usr/test/repos/trunk/cfg/fcm2_ns-dep_o_all.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_ns-dep_o_all.cfg
rename to usr/test/repos/trunk/cfg/fcm2_ns-dep_o_all.cfg
diff --git a/test/repos/trunk/cfg/fcm2_ns-dep_o_file.cfg b/usr/test/repos/trunk/cfg/fcm2_ns-dep_o_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_ns-dep_o_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_ns-dep_o_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_ns-dep_o_invalid.cfg b/usr/test/repos/trunk/cfg/fcm2_ns-dep_o_invalid.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_ns-dep_o_invalid.cfg
rename to usr/test/repos/trunk/cfg/fcm2_ns-dep_o_invalid.cfg
diff --git a/test/repos/trunk/cfg/fcm2_ops.cfg b/usr/test/repos/trunk/cfg/fcm2_ops.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_ops.cfg
rename to usr/test/repos/trunk/cfg/fcm2_ops.cfg
diff --git a/test/repos/trunk/cfg/fcm2_postproc_hpc.cfg b/usr/test/repos/trunk/cfg/fcm2_postproc_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_postproc_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_postproc_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_change_blockdata.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_change_blockdata.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_change_blockdata.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_change_blockdata.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_change_dependency.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_change_dependency.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_change_dependency.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_change_dependency.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_change_include.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_change_include.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_change_include.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_change_include.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_change_include_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_change_include_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_change_include_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_change_include_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_empty_subroutine.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_empty_subroutine.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_empty_subroutine.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_empty_subroutine.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit_force.cfg b/usr/test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit_force.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit_force.cfg
rename to usr/test/repos/trunk/cfg/fcm2_pp_empty_subroutine_inherit_force.cfg
diff --git a/test/repos/trunk/cfg/fcm2_revmatch_false.cfg b/usr/test/repos/trunk/cfg/fcm2_revmatch_false.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_revmatch_false.cfg
rename to usr/test/repos/trunk/cfg/fcm2_revmatch_false.cfg
diff --git a/test/repos/trunk/cfg/fcm2_single_file.cfg b/usr/test/repos/trunk/cfg/fcm2_single_file.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_single_file.cfg
rename to usr/test/repos/trunk/cfg/fcm2_single_file.cfg
diff --git a/test/repos/trunk/cfg/fcm2_space_in_name.cfg b/usr/test/repos/trunk/cfg/fcm2_space_in_name.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_space_in_name.cfg
rename to usr/test/repos/trunk/cfg/fcm2_space_in_name.cfg
diff --git a/test/repos/trunk/cfg/fcm2_sps.cfg b/usr/test/repos/trunk/cfg/fcm2_sps.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_sps.cfg
rename to usr/test/repos/trunk/cfg/fcm2_sps.cfg
diff --git a/test/repos/trunk/cfg/fcm2_symbolic_link.cfg b/usr/test/repos/trunk/cfg/fcm2_symbolic_link.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_symbolic_link.cfg
rename to usr/test/repos/trunk/cfg/fcm2_symbolic_link.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um.cfg b/usr/test/repos/trunk/cfg/fcm2_um.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um77.cfg b/usr/test/repos/trunk/cfg/fcm2_um77.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um77.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um77.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um77_hpc.cfg b/usr/test/repos/trunk/cfg/fcm2_um77_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um77_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um77_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um77_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_um77_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um77_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um77_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um77_inherit_hpc.cfg b/usr/test/repos/trunk/cfg/fcm2_um77_inherit_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um77_inherit_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um77_inherit_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um_hpc.cfg b/usr/test/repos/trunk/cfg/fcm2_um_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um_inherit.cfg b/usr/test/repos/trunk/cfg/fcm2_um_inherit.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um_inherit.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um_inherit.cfg
diff --git a/test/repos/trunk/cfg/fcm2_um_inherit_hpc.cfg b/usr/test/repos/trunk/cfg/fcm2_um_inherit_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_um_inherit_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_um_inherit_hpc.cfg
diff --git a/test/repos/trunk/cfg/fcm2_var.cfg b/usr/test/repos/trunk/cfg/fcm2_var.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_var.cfg
rename to usr/test/repos/trunk/cfg/fcm2_var.cfg
diff --git a/test/repos/trunk/cfg/fcm2_var_hpc.cfg b/usr/test/repos/trunk/cfg/fcm2_var_hpc.cfg
similarity index 100%
rename from test/repos/trunk/cfg/fcm2_var_hpc.cfg
rename to usr/test/repos/trunk/cfg/fcm2_var_hpc.cfg
diff --git a/test/repos/trunk/module/hello_constants.f90 b/usr/test/repos/trunk/module/hello_constants.f90
similarity index 100%
rename from test/repos/trunk/module/hello_constants.f90
rename to usr/test/repos/trunk/module/hello_constants.f90
diff --git a/test/repos/trunk/module/hello_constants.inc b/usr/test/repos/trunk/module/hello_constants.inc
similarity index 100%
rename from test/repos/trunk/module/hello_constants.inc
rename to usr/test/repos/trunk/module/hello_constants.inc
diff --git a/test/repos/trunk/module/hello_constants_dummy.inc b/usr/test/repos/trunk/module/hello_constants_dummy.inc
similarity index 100%
rename from test/repos/trunk/module/hello_constants_dummy.inc
rename to usr/test/repos/trunk/module/hello_constants_dummy.inc
diff --git a/test/repos/trunk/namelist/namelist.NL b/usr/test/repos/trunk/namelist/namelist.NL
similarity index 100%
rename from test/repos/trunk/namelist/namelist.NL
rename to usr/test/repos/trunk/namelist/namelist.NL
diff --git a/test/repos/trunk/pro/hello.pro b/usr/test/repos/trunk/pro/hello.pro
similarity index 100%
rename from test/repos/trunk/pro/hello.pro
rename to usr/test/repos/trunk/pro/hello.pro
diff --git a/test/repos/trunk/pro/plot.pro b/usr/test/repos/trunk/pro/plot.pro
similarity index 100%
rename from test/repos/trunk/pro/plot.pro
rename to usr/test/repos/trunk/pro/plot.pro
diff --git a/test/repos/trunk/program/hello.F90 b/usr/test/repos/trunk/program/hello.F90
similarity index 100%
rename from test/repos/trunk/program/hello.F90
rename to usr/test/repos/trunk/program/hello.F90
diff --git a/test/repos/trunk/script/hello.sh b/usr/test/repos/trunk/script/hello.sh
similarity index 100%
rename from test/repos/trunk/script/hello.sh
rename to usr/test/repos/trunk/script/hello.sh
diff --git a/test/repos/trunk/subroutine/hello_c.c b/usr/test/repos/trunk/subroutine/hello_c.c
similarity index 100%
rename from test/repos/trunk/subroutine/hello_c.c
rename to usr/test/repos/trunk/subroutine/hello_c.c
diff --git a/test/repos/trunk/subroutine/hello_sub.F90 b/usr/test/repos/trunk/subroutine/hello_sub.F90
similarity index 100%
rename from test/repos/trunk/subroutine/hello_sub.F90
rename to usr/test/repos/trunk/subroutine/hello_sub.F90
diff --git a/test/repos/trunk/subroutine/hello_sub.h b/usr/test/repos/trunk/subroutine/hello_sub.h
similarity index 100%
rename from test/repos/trunk/subroutine/hello_sub.h
rename to usr/test/repos/trunk/subroutine/hello_sub.h
diff --git a/test/repos/trunk/subroutine/hello_sub_dummy.h b/usr/test/repos/trunk/subroutine/hello_sub_dummy.h
similarity index 100%
rename from test/repos/trunk/subroutine/hello_sub_dummy.h
rename to usr/test/repos/trunk/subroutine/hello_sub_dummy.h
diff --git a/test/run_tests b/usr/test/run_tests
similarity index 100%
rename from test/run_tests
rename to usr/test/run_tests
diff --git a/test/test_config/fcm1_add_directory b/usr/test/test_config/fcm1_add_directory
similarity index 100%
rename from test/test_config/fcm1_add_directory
rename to usr/test/test_config/fcm1_add_directory
diff --git a/test/test_config/fcm1_add_directory_expsrc b/usr/test/test_config/fcm1_add_directory_expsrc
similarity index 100%
rename from test/test_config/fcm1_add_directory_expsrc
rename to usr/test/test_config/fcm1_add_directory_expsrc
diff --git a/test/test_config/fcm1_branches_clash b/usr/test/test_config/fcm1_branches_clash
similarity index 100%
rename from test/test_config/fcm1_branches_clash
rename to usr/test/test_config/fcm1_branches_clash
diff --git a/test/test_config/fcm1_branches_merge_conflict_fail b/usr/test/test_config/fcm1_branches_merge_conflict_fail
similarity index 100%
rename from test/test_config/fcm1_branches_merge_conflict_fail
rename to usr/test/test_config/fcm1_branches_merge_conflict_fail
diff --git a/test/test_config/fcm1_branches_merge_incremental b/usr/test/test_config/fcm1_branches_merge_incremental
similarity index 100%
rename from test/test_config/fcm1_branches_merge_incremental
rename to usr/test/test_config/fcm1_branches_merge_incremental
diff --git a/test/test_config/fcm1_branches_merge_inherit_wrong_include b/usr/test/test_config/fcm1_branches_merge_inherit_wrong_include
similarity index 100%
rename from test/test_config/fcm1_branches_merge_inherit_wrong_include
rename to usr/test/test_config/fcm1_branches_merge_inherit_wrong_include
diff --git a/test/test_config/fcm1_branches_merge_wcopies b/usr/test/test_config/fcm1_branches_merge_wcopies
similarity index 100%
rename from test/test_config/fcm1_branches_merge_wcopies
rename to usr/test/test_config/fcm1_branches_merge_wcopies
diff --git a/test/test_config/fcm1_branches_merge_wcopy b/usr/test/test_config/fcm1_branches_merge_wcopy
similarity index 100%
rename from test/test_config/fcm1_branches_merge_wcopy
rename to usr/test/test_config/fcm1_branches_merge_wcopy
diff --git a/test/test_config/fcm1_cflags_incremental b/usr/test/test_config/fcm1_cflags_incremental
similarity index 100%
rename from test/test_config/fcm1_cflags_incremental
rename to usr/test/test_config/fcm1_cflags_incremental
diff --git a/test/test_config/fcm1_change_src_type_incremental b/usr/test/test_config/fcm1_change_src_type_incremental
similarity index 100%
rename from test/test_config/fcm1_change_src_type_incremental
rename to usr/test/test_config/fcm1_change_src_type_incremental
diff --git a/test/test_config/fcm1_delete_directory b/usr/test/test_config/fcm1_delete_directory
similarity index 100%
rename from test/test_config/fcm1_delete_directory
rename to usr/test/test_config/fcm1_delete_directory
diff --git a/test/test_config/fcm1_delete_directory_inherit b/usr/test/test_config/fcm1_delete_directory_inherit
similarity index 100%
rename from test/test_config/fcm1_delete_directory_inherit
rename to usr/test/test_config/fcm1_delete_directory_inherit
diff --git a/test/test_config/fcm1_delete_file b/usr/test/test_config/fcm1_delete_file
similarity index 100%
rename from test/test_config/fcm1_delete_file
rename to usr/test/test_config/fcm1_delete_file
diff --git a/test/test_config/fcm1_delete_file_inherit b/usr/test/test_config/fcm1_delete_file_inherit
similarity index 100%
rename from test/test_config/fcm1_delete_file_inherit
rename to usr/test/test_config/fcm1_delete_file_inherit
diff --git a/test/test_config/fcm1_delete_inc_file b/usr/test/test_config/fcm1_delete_inc_file
similarity index 100%
rename from test/test_config/fcm1_delete_inc_file
rename to usr/test/test_config/fcm1_delete_inc_file
diff --git a/test/test_config/fcm1_delete_inc_file_inherit b/usr/test/test_config/fcm1_delete_inc_file_inherit
similarity index 100%
rename from test/test_config/fcm1_delete_inc_file_inherit
rename to usr/test/test_config/fcm1_delete_inc_file_inherit
diff --git a/test/test_config/fcm1_delete_inc_file_inherit_force b/usr/test/test_config/fcm1_delete_inc_file_inherit_force
similarity index 100%
rename from test/test_config/fcm1_delete_inc_file_inherit_force
rename to usr/test/test_config/fcm1_delete_inc_file_inherit_force
diff --git a/test/test_config/fcm1_delete_pp_file b/usr/test/test_config/fcm1_delete_pp_file
similarity index 100%
rename from test/test_config/fcm1_delete_pp_file
rename to usr/test/test_config/fcm1_delete_pp_file
diff --git a/test/test_config/fcm1_delete_pp_file_inherit b/usr/test/test_config/fcm1_delete_pp_file_inherit
similarity index 100%
rename from test/test_config/fcm1_delete_pp_file_inherit
rename to usr/test/test_config/fcm1_delete_pp_file_inherit
diff --git a/test/test_config/fcm1_delete_ppinc_file b/usr/test/test_config/fcm1_delete_ppinc_file
similarity index 100%
rename from test/test_config/fcm1_delete_ppinc_file
rename to usr/test/test_config/fcm1_delete_ppinc_file
diff --git a/test/test_config/fcm1_delete_ppinc_file_inherit b/usr/test/test_config/fcm1_delete_ppinc_file_inherit
similarity index 100%
rename from test/test_config/fcm1_delete_ppinc_file_inherit
rename to usr/test/test_config/fcm1_delete_ppinc_file_inherit
diff --git a/test/test_config/fcm1_delete_ppinc_file_inherit_force b/usr/test/test_config/fcm1_delete_ppinc_file_inherit_force
similarity index 100%
rename from test/test_config/fcm1_delete_ppinc_file_inherit_force
rename to usr/test/test_config/fcm1_delete_ppinc_file_inherit_force
diff --git a/test/test_config/fcm1_duplicate_target b/usr/test/test_config/fcm1_duplicate_target
similarity index 100%
rename from test/test_config/fcm1_duplicate_target
rename to usr/test/test_config/fcm1_duplicate_target
diff --git a/test/test_config/fcm1_exclude_dependency b/usr/test/test_config/fcm1_exclude_dependency
similarity index 100%
rename from test/test_config/fcm1_exclude_dependency
rename to usr/test/test_config/fcm1_exclude_dependency
diff --git a/test/test_config/fcm1_exe_permissions b/usr/test/test_config/fcm1_exe_permissions
similarity index 100%
rename from test/test_config/fcm1_exe_permissions
rename to usr/test/test_config/fcm1_exe_permissions
diff --git a/test/test_config/fcm1_exe_rename_incremental b/usr/test/test_config/fcm1_exe_rename_incremental
similarity index 100%
rename from test/test_config/fcm1_exe_rename_incremental
rename to usr/test/test_config/fcm1_exe_rename_incremental
diff --git a/test/test_config/fcm1_fc_incremental b/usr/test/test_config/fcm1_fc_incremental
similarity index 100%
rename from test/test_config/fcm1_fc_incremental
rename to usr/test/test_config/fcm1_fc_incremental
diff --git a/test/test_config/fcm1_fflags_incremental b/usr/test/test_config/fcm1_fflags_incremental
similarity index 100%
rename from test/test_config/fcm1_fflags_incremental
rename to usr/test/test_config/fcm1_fflags_incremental
diff --git a/test/test_config/fcm1_inc_devnull b/usr/test/test_config/fcm1_inc_devnull
similarity index 100%
rename from test/test_config/fcm1_inc_devnull
rename to usr/test/test_config/fcm1_inc_devnull
diff --git a/test/test_config/fcm1_inherit_invalid_path b/usr/test/test_config/fcm1_inherit_invalid_path
similarity index 100%
rename from test/test_config/fcm1_inherit_invalid_path
rename to usr/test/test_config/fcm1_inherit_invalid_path
diff --git a/test/test_config/fcm1_invalid_base_url b/usr/test/test_config/fcm1_invalid_base_url
similarity index 100%
rename from test/test_config/fcm1_invalid_base_url
rename to usr/test/test_config/fcm1_invalid_base_url
diff --git a/test/test_config/fcm1_invalid_branch_url b/usr/test/test_config/fcm1_invalid_branch_url
similarity index 100%
rename from test/test_config/fcm1_invalid_branch_url
rename to usr/test/test_config/fcm1_invalid_branch_url
diff --git a/test/test_config/fcm1_invalid_inc b/usr/test/test_config/fcm1_invalid_inc
similarity index 100%
rename from test/test_config/fcm1_invalid_inc
rename to usr/test/test_config/fcm1_invalid_inc
diff --git a/test/test_config/fcm1_invalid_namespace b/usr/test/test_config/fcm1_invalid_namespace
similarity index 100%
rename from test/test_config/fcm1_invalid_namespace
rename to usr/test/test_config/fcm1_invalid_namespace
diff --git a/test/test_config/fcm1_invalid_variable b/usr/test/test_config/fcm1_invalid_variable
similarity index 100%
rename from test/test_config/fcm1_invalid_variable
rename to usr/test/test_config/fcm1_invalid_variable
diff --git a/test/test_config/fcm1_ld_incremental b/usr/test/test_config/fcm1_ld_incremental
similarity index 100%
rename from test/test_config/fcm1_ld_incremental
rename to usr/test/test_config/fcm1_ld_incremental
diff --git a/test/test_config/fcm1_library b/usr/test/test_config/fcm1_library
similarity index 100%
rename from test/test_config/fcm1_library
rename to usr/test/test_config/fcm1_library
diff --git a/test/test_config/fcm1_library_rename b/usr/test/test_config/fcm1_library_rename
similarity index 100%
rename from test/test_config/fcm1_library_rename
rename to usr/test/test_config/fcm1_library_rename
diff --git a/test/test_config/fcm1_mirror b/usr/test/test_config/fcm1_mirror
similarity index 100%
rename from test/test_config/fcm1_mirror
rename to usr/test/test_config/fcm1_mirror
diff --git a/test/test_config/fcm1_mirror_inherit b/usr/test/test_config/fcm1_mirror_inherit
similarity index 100%
rename from test/test_config/fcm1_mirror_inherit
rename to usr/test/test_config/fcm1_mirror_inherit
diff --git a/test/test_config/fcm1_no_dep b/usr/test/test_config/fcm1_no_dep
similarity index 100%
rename from test/test_config/fcm1_no_dep
rename to usr/test/test_config/fcm1_no_dep
diff --git a/test/test_config/fcm1_ops_parallel b/usr/test/test_config/fcm1_ops_parallel
similarity index 100%
rename from test/test_config/fcm1_ops_parallel
rename to usr/test/test_config/fcm1_ops_parallel
diff --git a/test/test_config/fcm1_pp_change_include_inherit b/usr/test/test_config/fcm1_pp_change_include_inherit
similarity index 100%
rename from test/test_config/fcm1_pp_change_include_inherit
rename to usr/test/test_config/fcm1_pp_change_include_inherit
diff --git a/test/test_config/fcm1_pp_change_keys_incremental b/usr/test/test_config/fcm1_pp_change_keys_incremental
similarity index 100%
rename from test/test_config/fcm1_pp_change_keys_incremental
rename to usr/test/test_config/fcm1_pp_change_keys_incremental
diff --git a/test/test_config/fcm1_pp_empty_subroutine b/usr/test/test_config/fcm1_pp_empty_subroutine
similarity index 100%
rename from test/test_config/fcm1_pp_empty_subroutine
rename to usr/test/test_config/fcm1_pp_empty_subroutine
diff --git a/test/test_config/fcm1_pp_empty_subroutine_inherit b/usr/test/test_config/fcm1_pp_empty_subroutine_inherit
similarity index 100%
rename from test/test_config/fcm1_pp_empty_subroutine_inherit
rename to usr/test/test_config/fcm1_pp_empty_subroutine_inherit
diff --git a/test/test_config/fcm1_pp_empty_subroutine_inherit_force b/usr/test/test_config/fcm1_pp_empty_subroutine_inherit_force
similarity index 100%
rename from test/test_config/fcm1_pp_empty_subroutine_inherit_force
rename to usr/test/test_config/fcm1_pp_empty_subroutine_inherit_force
diff --git a/test/test_config/fcm1_revmatch_true b/usr/test/test_config/fcm1_revmatch_true
similarity index 100%
rename from test/test_config/fcm1_revmatch_true
rename to usr/test/test_config/fcm1_revmatch_true
diff --git a/test/test_config/fcm1_sps_parallel b/usr/test/test_config/fcm1_sps_parallel
similarity index 100%
rename from test/test_config/fcm1_sps_parallel
rename to usr/test/test_config/fcm1_sps_parallel
diff --git a/test/test_config/fcm1_um b/usr/test/test_config/fcm1_um
similarity index 100%
rename from test/test_config/fcm1_um
rename to usr/test/test_config/fcm1_um
diff --git a/test/test_config/fcm1_um_inherit b/usr/test/test_config/fcm1_um_inherit
similarity index 100%
rename from test/test_config/fcm1_um_inherit
rename to usr/test/test_config/fcm1_um_inherit
diff --git a/test/test_config/fcm1_var_parallel b/usr/test/test_config/fcm1_var_parallel
similarity index 100%
rename from test/test_config/fcm1_var_parallel
rename to usr/test/test_config/fcm1_var_parallel
diff --git a/test/test_config/fcm2_branches_clash b/usr/test/test_config/fcm2_branches_clash
similarity index 100%
rename from test/test_config/fcm2_branches_clash
rename to usr/test/test_config/fcm2_branches_clash
diff --git a/test/test_config/fcm2_branches_merge_incremental b/usr/test/test_config/fcm2_branches_merge_incremental
similarity index 100%
rename from test/test_config/fcm2_branches_merge_incremental
rename to usr/test/test_config/fcm2_branches_merge_incremental
diff --git a/test/test_config/fcm2_branches_merge_inherit_wrong_include b/usr/test/test_config/fcm2_branches_merge_inherit_wrong_include
similarity index 100%
rename from test/test_config/fcm2_branches_merge_inherit_wrong_include
rename to usr/test/test_config/fcm2_branches_merge_inherit_wrong_include
diff --git a/test/test_config/fcm2_branches_merge_wcopies b/usr/test/test_config/fcm2_branches_merge_wcopies
similarity index 100%
rename from test/test_config/fcm2_branches_merge_wcopies
rename to usr/test/test_config/fcm2_branches_merge_wcopies
diff --git a/test/test_config/fcm2_branches_merge_wcopy b/usr/test/test_config/fcm2_branches_merge_wcopy
similarity index 100%
rename from test/test_config/fcm2_branches_merge_wcopy
rename to usr/test/test_config/fcm2_branches_merge_wcopy
diff --git a/test/test_config/fcm2_cflags_incremental b/usr/test/test_config/fcm2_cflags_incremental
similarity index 100%
rename from test/test_config/fcm2_cflags_incremental
rename to usr/test/test_config/fcm2_cflags_incremental
diff --git a/test/test_config/fcm2_cyclic_dep_fail b/usr/test/test_config/fcm2_cyclic_dep_fail
similarity index 100%
rename from test/test_config/fcm2_cyclic_dep_fail
rename to usr/test/test_config/fcm2_cyclic_dep_fail
diff --git a/test/test_config/fcm2_delete_file b/usr/test/test_config/fcm2_delete_file
similarity index 100%
rename from test/test_config/fcm2_delete_file
rename to usr/test/test_config/fcm2_delete_file
diff --git a/test/test_config/fcm2_delete_file_inherit b/usr/test/test_config/fcm2_delete_file_inherit
similarity index 100%
rename from test/test_config/fcm2_delete_file_inherit
rename to usr/test/test_config/fcm2_delete_file_inherit
diff --git a/test/test_config/fcm2_delete_inc_file b/usr/test/test_config/fcm2_delete_inc_file
similarity index 100%
rename from test/test_config/fcm2_delete_inc_file
rename to usr/test/test_config/fcm2_delete_inc_file
diff --git a/test/test_config/fcm2_delete_inc_file_inherit b/usr/test/test_config/fcm2_delete_inc_file_inherit
similarity index 100%
rename from test/test_config/fcm2_delete_inc_file_inherit
rename to usr/test/test_config/fcm2_delete_inc_file_inherit
diff --git a/test/test_config/fcm2_delete_inc_file_inherit_force b/usr/test/test_config/fcm2_delete_inc_file_inherit_force
similarity index 100%
rename from test/test_config/fcm2_delete_inc_file_inherit_force
rename to usr/test/test_config/fcm2_delete_inc_file_inherit_force
diff --git a/test/test_config/fcm2_delete_pp_file b/usr/test/test_config/fcm2_delete_pp_file
similarity index 100%
rename from test/test_config/fcm2_delete_pp_file
rename to usr/test/test_config/fcm2_delete_pp_file
diff --git a/test/test_config/fcm2_delete_pp_file_inherit b/usr/test/test_config/fcm2_delete_pp_file_inherit
similarity index 100%
rename from test/test_config/fcm2_delete_pp_file_inherit
rename to usr/test/test_config/fcm2_delete_pp_file_inherit
diff --git a/test/test_config/fcm2_delete_ppinc_file b/usr/test/test_config/fcm2_delete_ppinc_file
similarity index 100%
rename from test/test_config/fcm2_delete_ppinc_file
rename to usr/test/test_config/fcm2_delete_ppinc_file
diff --git a/test/test_config/fcm2_delete_ppinc_file_inherit b/usr/test/test_config/fcm2_delete_ppinc_file_inherit
similarity index 100%
rename from test/test_config/fcm2_delete_ppinc_file_inherit
rename to usr/test/test_config/fcm2_delete_ppinc_file_inherit
diff --git a/test/test_config/fcm2_delete_ppinc_file_inherit_force b/usr/test/test_config/fcm2_delete_ppinc_file_inherit_force
similarity index 100%
rename from test/test_config/fcm2_delete_ppinc_file_inherit_force
rename to usr/test/test_config/fcm2_delete_ppinc_file_inherit_force
diff --git a/test/test_config/fcm2_dep_o_invalid b/usr/test/test_config/fcm2_dep_o_invalid
similarity index 100%
rename from test/test_config/fcm2_dep_o_invalid
rename to usr/test/test_config/fcm2_dep_o_invalid
diff --git a/test/test_config/fcm2_duplicate_target b/usr/test/test_config/fcm2_duplicate_target
similarity index 100%
rename from test/test_config/fcm2_duplicate_target
rename to usr/test/test_config/fcm2_duplicate_target
diff --git a/test/test_config/fcm2_exclude_dependency b/usr/test/test_config/fcm2_exclude_dependency
similarity index 100%
rename from test/test_config/fcm2_exclude_dependency
rename to usr/test/test_config/fcm2_exclude_dependency
diff --git a/test/test_config/fcm2_exe_permissions b/usr/test/test_config/fcm2_exe_permissions
similarity index 100%
rename from test/test_config/fcm2_exe_permissions
rename to usr/test/test_config/fcm2_exe_permissions
diff --git a/test/test_config/fcm2_exe_rename_incremental b/usr/test/test_config/fcm2_exe_rename_incremental
similarity index 100%
rename from test/test_config/fcm2_exe_rename_incremental
rename to usr/test/test_config/fcm2_exe_rename_incremental
diff --git a/test/test_config/fcm2_fc_incremental b/usr/test/test_config/fcm2_fc_incremental
similarity index 100%
rename from test/test_config/fcm2_fc_incremental
rename to usr/test/test_config/fcm2_fc_incremental
diff --git a/test/test_config/fcm2_fflags_incremental b/usr/test/test_config/fcm2_fflags_incremental
similarity index 100%
rename from test/test_config/fcm2_fflags_incremental
rename to usr/test/test_config/fcm2_fflags_incremental
diff --git a/test/test_config/fcm2_inc_devnull b/usr/test/test_config/fcm2_inc_devnull
similarity index 100%
rename from test/test_config/fcm2_inc_devnull
rename to usr/test/test_config/fcm2_inc_devnull
diff --git a/test/test_config/fcm2_inherit_invalid_path b/usr/test/test_config/fcm2_inherit_invalid_path
similarity index 100%
rename from test/test_config/fcm2_inherit_invalid_path
rename to usr/test/test_config/fcm2_inherit_invalid_path
diff --git a/test/test_config/fcm2_inherit_redefine_fail b/usr/test/test_config/fcm2_inherit_redefine_fail
similarity index 100%
rename from test/test_config/fcm2_inherit_redefine_fail
rename to usr/test/test_config/fcm2_inherit_redefine_fail
diff --git a/test/test_config/fcm2_invalid_base_url b/usr/test/test_config/fcm2_invalid_base_url
similarity index 100%
rename from test/test_config/fcm2_invalid_base_url
rename to usr/test/test_config/fcm2_invalid_base_url
diff --git a/test/test_config/fcm2_invalid_branch_url b/usr/test/test_config/fcm2_invalid_branch_url
similarity index 100%
rename from test/test_config/fcm2_invalid_branch_url
rename to usr/test/test_config/fcm2_invalid_branch_url
diff --git a/test/test_config/fcm2_invalid_branch_url2 b/usr/test/test_config/fcm2_invalid_branch_url2
similarity index 100%
rename from test/test_config/fcm2_invalid_branch_url2
rename to usr/test/test_config/fcm2_invalid_branch_url2
diff --git a/test/test_config/fcm2_invalid_inc b/usr/test/test_config/fcm2_invalid_inc
similarity index 100%
rename from test/test_config/fcm2_invalid_inc
rename to usr/test/test_config/fcm2_invalid_inc
diff --git a/test/test_config/fcm2_invalid_label b/usr/test/test_config/fcm2_invalid_label
similarity index 100%
rename from test/test_config/fcm2_invalid_label
rename to usr/test/test_config/fcm2_invalid_label
diff --git a/test/test_config/fcm2_invalid_modifier b/usr/test/test_config/fcm2_invalid_modifier
similarity index 100%
rename from test/test_config/fcm2_invalid_modifier
rename to usr/test/test_config/fcm2_invalid_modifier
diff --git a/test/test_config/fcm2_invalid_modifiers b/usr/test/test_config/fcm2_invalid_modifiers
similarity index 100%
rename from test/test_config/fcm2_invalid_modifiers
rename to usr/test/test_config/fcm2_invalid_modifiers
diff --git a/test/test_config/fcm2_invalid_namespace b/usr/test/test_config/fcm2_invalid_namespace
similarity index 100%
rename from test/test_config/fcm2_invalid_namespace
rename to usr/test/test_config/fcm2_invalid_namespace
diff --git a/test/test_config/fcm2_invalid_namespace2 b/usr/test/test_config/fcm2_invalid_namespace2
similarity index 100%
rename from test/test_config/fcm2_invalid_namespace2
rename to usr/test/test_config/fcm2_invalid_namespace2
diff --git a/test/test_config/fcm2_invalid_target b/usr/test/test_config/fcm2_invalid_target
similarity index 100%
rename from test/test_config/fcm2_invalid_target
rename to usr/test/test_config/fcm2_invalid_target
diff --git a/test/test_config/fcm2_invalid_variable b/usr/test/test_config/fcm2_invalid_variable
similarity index 100%
rename from test/test_config/fcm2_invalid_variable
rename to usr/test/test_config/fcm2_invalid_variable
diff --git a/test/test_config/fcm2_library b/usr/test/test_config/fcm2_library
similarity index 100%
rename from test/test_config/fcm2_library
rename to usr/test/test_config/fcm2_library
diff --git a/test/test_config/fcm2_library_rename b/usr/test/test_config/fcm2_library_rename
similarity index 100%
rename from test/test_config/fcm2_library_rename
rename to usr/test/test_config/fcm2_library_rename
diff --git a/test/test_config/fcm2_mirror b/usr/test/test_config/fcm2_mirror
similarity index 100%
rename from test/test_config/fcm2_mirror
rename to usr/test/test_config/fcm2_mirror
diff --git a/test/test_config/fcm2_mirror_after_pp b/usr/test/test_config/fcm2_mirror_after_pp
similarity index 100%
rename from test/test_config/fcm2_mirror_after_pp
rename to usr/test/test_config/fcm2_mirror_after_pp
diff --git a/test/test_config/fcm2_mirror_inherit b/usr/test/test_config/fcm2_mirror_inherit
similarity index 100%
rename from test/test_config/fcm2_mirror_inherit
rename to usr/test/test_config/fcm2_mirror_inherit
diff --git a/test/test_config/fcm2_mirror_inherit_fflags b/usr/test/test_config/fcm2_mirror_inherit_fflags
similarity index 100%
rename from test/test_config/fcm2_mirror_inherit_fflags
rename to usr/test/test_config/fcm2_mirror_inherit_fflags
diff --git a/test/test_config/fcm2_mirror_inherit_notarget b/usr/test/test_config/fcm2_mirror_inherit_notarget
similarity index 100%
rename from test/test_config/fcm2_mirror_inherit_notarget
rename to usr/test/test_config/fcm2_mirror_inherit_notarget
diff --git a/test/test_config/fcm2_modify_subroutine_inherit b/usr/test/test_config/fcm2_modify_subroutine_inherit
similarity index 100%
rename from test/test_config/fcm2_modify_subroutine_inherit
rename to usr/test/test_config/fcm2_modify_subroutine_inherit
diff --git a/test/test_config/fcm2_multi_inherit b/usr/test/test_config/fcm2_multi_inherit
similarity index 100%
rename from test/test_config/fcm2_multi_inherit
rename to usr/test/test_config/fcm2_multi_inherit
diff --git a/test/test_config/fcm2_no_dep b/usr/test/test_config/fcm2_no_dep
similarity index 100%
rename from test/test_config/fcm2_no_dep
rename to usr/test/test_config/fcm2_no_dep
diff --git a/test/test_config/fcm2_ns-dep_o_invalid b/usr/test/test_config/fcm2_ns-dep_o_invalid
similarity index 100%
rename from test/test_config/fcm2_ns-dep_o_invalid
rename to usr/test/test_config/fcm2_ns-dep_o_invalid
diff --git a/test/test_config/fcm2_ops_parallel b/usr/test/test_config/fcm2_ops_parallel
similarity index 100%
rename from test/test_config/fcm2_ops_parallel
rename to usr/test/test_config/fcm2_ops_parallel
diff --git a/test/test_config/fcm2_override_variable b/usr/test/test_config/fcm2_override_variable
similarity index 100%
rename from test/test_config/fcm2_override_variable
rename to usr/test/test_config/fcm2_override_variable
diff --git a/test/test_config/fcm2_pp_change_include_inherit b/usr/test/test_config/fcm2_pp_change_include_inherit
similarity index 100%
rename from test/test_config/fcm2_pp_change_include_inherit
rename to usr/test/test_config/fcm2_pp_change_include_inherit
diff --git a/test/test_config/fcm2_pp_change_keys_incremental b/usr/test/test_config/fcm2_pp_change_keys_incremental
similarity index 100%
rename from test/test_config/fcm2_pp_change_keys_incremental
rename to usr/test/test_config/fcm2_pp_change_keys_incremental
diff --git a/test/test_config/fcm2_pp_empty_subroutine b/usr/test/test_config/fcm2_pp_empty_subroutine
similarity index 100%
rename from test/test_config/fcm2_pp_empty_subroutine
rename to usr/test/test_config/fcm2_pp_empty_subroutine
diff --git a/test/test_config/fcm2_pp_empty_subroutine_inherit b/usr/test/test_config/fcm2_pp_empty_subroutine_inherit
similarity index 100%
rename from test/test_config/fcm2_pp_empty_subroutine_inherit
rename to usr/test/test_config/fcm2_pp_empty_subroutine_inherit
diff --git a/test/test_config/fcm2_pp_empty_subroutine_inherit_force b/usr/test/test_config/fcm2_pp_empty_subroutine_inherit_force
similarity index 100%
rename from test/test_config/fcm2_pp_empty_subroutine_inherit_force
rename to usr/test/test_config/fcm2_pp_empty_subroutine_inherit_force
diff --git a/test/test_config/fcm2_sps_parallel b/usr/test/test_config/fcm2_sps_parallel
similarity index 100%
rename from test/test_config/fcm2_sps_parallel
rename to usr/test/test_config/fcm2_sps_parallel
diff --git a/test/test_config/fcm2_um b/usr/test/test_config/fcm2_um
similarity index 100%
rename from test/test_config/fcm2_um
rename to usr/test/test_config/fcm2_um
diff --git a/test/test_config/fcm2_um77 b/usr/test/test_config/fcm2_um77
similarity index 100%
rename from test/test_config/fcm2_um77
rename to usr/test/test_config/fcm2_um77
diff --git a/test/test_config/fcm2_um77_inherit b/usr/test/test_config/fcm2_um77_inherit
similarity index 100%
rename from test/test_config/fcm2_um77_inherit
rename to usr/test/test_config/fcm2_um77_inherit
diff --git a/test/test_config/fcm2_um_inherit b/usr/test/test_config/fcm2_um_inherit
similarity index 100%
rename from test/test_config/fcm2_um_inherit
rename to usr/test/test_config/fcm2_um_inherit
diff --git a/test/test_config/fcm2_var_parallel b/usr/test/test_config/fcm2_var_parallel
similarity index 100%
rename from test/test_config/fcm2_var_parallel
rename to usr/test/test_config/fcm2_var_parallel
diff --git a/test/test_include/inc/fortran.inc b/usr/test/test_include/inc/fortran.inc
similarity index 100%
rename from test/test_include/inc/fortran.inc
rename to usr/test/test_include/inc/fortran.inc
diff --git a/test/test_include/prog/fortran.inc b/usr/test/test_include/prog/fortran.inc
similarity index 100%
rename from test/test_include/prog/fortran.inc
rename to usr/test/test_include/prog/fortran.inc
diff --git a/test/test_include/prog/test_fortran_inc.f90 b/usr/test/test_include/prog/test_fortran_inc.f90
similarity index 100%
rename from test/test_include/prog/test_fortran_inc.f90
rename to usr/test/test_include/prog/test_fortran_inc.f90
diff --git a/test/test_include/prog/test_prepro_inc.F90 b/usr/test/test_include/prog/test_prepro_inc.F90
similarity index 100%
rename from test/test_include/prog/test_prepro_inc.F90
rename to usr/test/test_include/prog/test_prepro_inc.F90
diff --git a/test/test_include/test.sh b/usr/test/test_include/test.sh
similarity index 100%
rename from test/test_include/test.sh
rename to usr/test/test_include/test.sh
diff --git a/test/tests_functional.list b/usr/test/tests_functional.list
similarity index 100%
rename from test/tests_functional.list
rename to usr/test/tests_functional.list
diff --git a/test/tests_perf_local.list b/usr/test/tests_perf_local.list
similarity index 100%
rename from test/tests_perf_local.list
rename to usr/test/tests_perf_local.list
diff --git a/test/tests_perf_remote.list b/usr/test/tests_perf_remote.list
similarity index 100%
rename from test/tests_perf_remote.list
rename to usr/test/tests_perf_remote.list
diff --git a/test/wrapper_scripts/wrap_ar b/usr/test/wrapper_scripts/wrap_ar
similarity index 100%
rename from test/wrapper_scripts/wrap_ar
rename to usr/test/wrapper_scripts/wrap_ar
diff --git a/test/wrapper_scripts/wrap_cc b/usr/test/wrapper_scripts/wrap_cc
similarity index 100%
rename from test/wrapper_scripts/wrap_cc
rename to usr/test/wrapper_scripts/wrap_cc
diff --git a/test/wrapper_scripts/wrap_fc b/usr/test/wrapper_scripts/wrap_fc
similarity index 100%
rename from test/wrapper_scripts/wrap_fc
rename to usr/test/wrapper_scripts/wrap_fc
diff --git a/test/wrapper_scripts/wrap_fc2 b/usr/test/wrapper_scripts/wrap_fc2
similarity index 100%
rename from test/wrapper_scripts/wrap_fc2
rename to usr/test/wrapper_scripts/wrap_fc2
diff --git a/test/wrapper_scripts/wrap_ld b/usr/test/wrapper_scripts/wrap_ld
similarity index 100%
rename from test/wrapper_scripts/wrap_ld
rename to usr/test/wrapper_scripts/wrap_ld
diff --git a/test/wrapper_scripts/wrap_ld2 b/usr/test/wrapper_scripts/wrap_ld2
similarity index 100%
rename from test/wrapper_scripts/wrap_ld2
rename to usr/test/wrapper_scripts/wrap_ld2
diff --git a/test/wrapper_scripts/wrap_mpicc b/usr/test/wrapper_scripts/wrap_mpicc
similarity index 100%
rename from test/wrapper_scripts/wrap_mpicc
rename to usr/test/wrapper_scripts/wrap_mpicc
diff --git a/test/wrapper_scripts/wrap_mpif90 b/usr/test/wrapper_scripts/wrap_mpif90
similarity index 100%
rename from test/wrapper_scripts/wrap_mpif90
rename to usr/test/wrapper_scripts/wrap_mpif90
diff --git a/test/wrapper_scripts/wrap_pp b/usr/test/wrapper_scripts/wrap_pp
similarity index 100%
rename from test/wrapper_scripts/wrap_pp
rename to usr/test/wrapper_scripts/wrap_pp
diff --git a/tutorial/README b/usr/tutorial/README
similarity index 100%
rename from tutorial/README
rename to usr/tutorial/README
diff --git a/tutorial/fcm-tutorial-repos-create b/usr/tutorial/fcm-tutorial-repos-create
similarity index 100%
rename from tutorial/fcm-tutorial-repos-create
rename to usr/tutorial/fcm-tutorial-repos-create
diff --git a/tutorial/hooks/pre-commit b/usr/tutorial/hooks/pre-commit
similarity index 100%
rename from tutorial/hooks/pre-commit
rename to usr/tutorial/hooks/pre-commit
diff --git a/tutorial/trunk-r1/doc/hello.html b/usr/tutorial/trunk-r1/doc/hello.html
similarity index 100%
rename from tutorial/trunk-r1/doc/hello.html
rename to usr/tutorial/trunk-r1/doc/hello.html
diff --git a/tutorial/trunk-r1/fcm-make.cfg b/usr/tutorial/trunk-r1/fcm-make.cfg
similarity index 100%
rename from tutorial/trunk-r1/fcm-make.cfg
rename to usr/tutorial/trunk-r1/fcm-make.cfg
diff --git a/tutorial/trunk-r1/src/module/hello_constants.f90 b/usr/tutorial/trunk-r1/src/module/hello_constants.f90
similarity index 100%
rename from tutorial/trunk-r1/src/module/hello_constants.f90
rename to usr/tutorial/trunk-r1/src/module/hello_constants.f90
diff --git a/tutorial/trunk-r1/src/module/hello_num.f90 b/usr/tutorial/trunk-r1/src/module/hello_num.f90
similarity index 100%
rename from tutorial/trunk-r1/src/module/hello_num.f90
rename to usr/tutorial/trunk-r1/src/module/hello_num.f90
diff --git a/tutorial/trunk-r1/src/program/hello.f90 b/usr/tutorial/trunk-r1/src/program/hello.f90
similarity index 100%
rename from tutorial/trunk-r1/src/program/hello.f90
rename to usr/tutorial/trunk-r1/src/program/hello.f90
diff --git a/tutorial/trunk-r1/src/subroutine/hello_c.c b/usr/tutorial/trunk-r1/src/subroutine/hello_c.c
similarity index 100%
rename from tutorial/trunk-r1/src/subroutine/hello_c.c
rename to usr/tutorial/trunk-r1/src/subroutine/hello_c.c
diff --git a/tutorial/trunk-r1/src/subroutine/hello_sub.f90 b/usr/tutorial/trunk-r1/src/subroutine/hello_sub.f90
similarity index 100%
rename from tutorial/trunk-r1/src/subroutine/hello_sub.f90
rename to usr/tutorial/trunk-r1/src/subroutine/hello_sub.f90

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fcm.git



More information about the debian-science-commits mailing list