prefixed installation now works.

fixed bug with -m, it couldn't work because libVishapOberon contained
bindings to X11 but was not linked to X11


Former-commit-id: f3548d289f
This commit is contained in:
Norayr Chilingarian 2014-03-20 21:11:03 +04:00
parent 30ae085f56
commit bb1e56ad56
15 changed files with 142 additions and 121 deletions

5
src/voc/prf.Mod Normal file
View file

@ -0,0 +1,5 @@
MODULE prf;
CONST prefix* = "/opt";
END prf.

5
src/voc/prf.Mod_default Normal file
View file

@ -0,0 +1,5 @@
MODULE prf;
CONST prefix* = "/opt";
END prf.

View file

@ -1,5 +1,5 @@
MODULE version;
IMPORT Strings := oocOakStrings, architecture;
IMPORT Strings := oocOakStrings, architecture, prf;
CONST
(* targets *)
gnux86* = 0; gnux8664* = 1; gnuarmv6j* = 2; gnuarmv6jhardfp* = 3; gnuarmv7ahardfp* = 4; gnupowerpc* = 5;
@ -15,7 +15,8 @@ COPY(version, versionLong);
Strings.Append (" ", versionLong);
Strings.Append(date, versionLong);
prefix := "";
prefix0 := "/opt";
(*prefix0 := "/opt";*)
COPY(prf.prefix, prefix0);
COPY (prefix0, prefix);
Strings.Append ("/voc-", prefix);
Strings.Append(version, prefix); (* /opt/voc-1.0 *)