diff --git a/05vishap.conf b/05vishap.conf index 98072b24..7a43aef3 100644 --- a/05vishap.conf +++ b/05vishap.conf @@ -1 +1 @@ -/opt/voc-1.0/lib +/Users/noch/local/voc-1.0/lib diff --git a/makefile.darwin.clang.x86_64 b/makefile.darwin.clang.x86_64 index 28e4fb04..5a0dd466 100644 --- a/makefile.darwin.clang.x86_64 +++ b/makefile.darwin.clang.x86_64 @@ -20,7 +20,8 @@ LIBNAME = VishapOberon LIBRARY = lib$(LIBNAME) ifndef PRF -PRF = "/opt" +#PRF = "/opt" +PRF = "/Users/noch/local" endif PREFIX = $(PRF)/voc-$(RELEASE) PREFIXLN = $(PRF)/voc @@ -295,7 +296,7 @@ install: cp *.sym $(PREFIX)/lib/voc/sym/ #cp 05vishap.conf /etc/ld.so.conf.d/ - ldconfig + #ldconfig ln -s $(PREFIX) $(PREFIXLN) # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ diff --git a/ocat b/ocat index 98f6c0c2..53abd573 100755 Binary files a/ocat and b/ocat differ diff --git a/showdef b/showdef index 03332b4f..e8af78b5 100755 Binary files a/showdef and b/showdef differ diff --git a/src/voc/prf.Mod b/src/voc/prf.Mod index 2f4d8f24..d97f3ae5 100644 --- a/src/voc/prf.Mod +++ b/src/voc/prf.Mod @@ -1,5 +1,5 @@ MODULE prf; -CONST prefix* = "/opt"; +CONST prefix* = "/Users/noch/local"; END prf. diff --git a/src/voc/version.Mod b/src/voc/version.Mod index fa89170c..7affc343 100644 --- a/src/voc/version.Mod +++ b/src/voc/version.Mod @@ -4,7 +4,7 @@ CONST (* targets *) gnux86* = 0; gnux8664* = 1; gnuarmv6j* = 2; gnuarmv6jhardfp* = 3; gnuarmv7ahardfp* = 4; gnupowerpc* = 5; -VAR arch-, version-, date-, versionLong-, prefix0-, prefix- : ARRAY 23 OF CHAR; +VAR arch-, version-, date-, versionLong-, prefix0-, prefix- : ARRAY 256 OF CHAR; defaultTarget* : INTEGER; BEGIN arch := architecture.arch; diff --git a/voc b/voc index 333eeef2..5bcb7b99 100755 Binary files a/voc and b/voc differ diff --git a/vocstatic.darwin.clang.x86_64 b/vocstatic.darwin.clang.x86_64 index 6d30dd50..f0c20160 100755 Binary files a/vocstatic.darwin.clang.x86_64 and b/vocstatic.darwin.clang.x86_64 differ