fixed problem with short prefix path in version module

This commit is contained in:
Norayr Chilingarian 2014-03-21 04:22:23 +08:00
parent e1f76da278
commit bdb2b32588
8 changed files with 6 additions and 5 deletions

View file

@ -1 +1 @@
/opt/voc-1.0/lib /Users/noch/local/voc-1.0/lib

View file

@ -20,7 +20,8 @@ LIBNAME = VishapOberon
LIBRARY = lib$(LIBNAME) LIBRARY = lib$(LIBNAME)
ifndef PRF ifndef PRF
PRF = "/opt" #PRF = "/opt"
PRF = "/Users/noch/local"
endif endif
PREFIX = $(PRF)/voc-$(RELEASE) PREFIX = $(PRF)/voc-$(RELEASE)
PREFIXLN = $(PRF)/voc PREFIXLN = $(PRF)/voc
@ -295,7 +296,7 @@ install:
cp *.sym $(PREFIX)/lib/voc/sym/ cp *.sym $(PREFIX)/lib/voc/sym/
#cp 05vishap.conf /etc/ld.so.conf.d/ #cp 05vishap.conf /etc/ld.so.conf.d/
ldconfig #ldconfig
ln -s $(PREFIX) $(PREFIXLN) ln -s $(PREFIX) $(PREFIXLN)
# cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/ # cp *.o $(PREFIX)/lib/voc/$(RELEASE)/obj/

BIN
ocat

Binary file not shown.

BIN
showdef

Binary file not shown.

View file

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

View file

@ -4,7 +4,7 @@ CONST
(* targets *) (* targets *)
gnux86* = 0; gnux8664* = 1; gnuarmv6j* = 2; gnuarmv6jhardfp* = 3; gnuarmv7ahardfp* = 4; gnupowerpc* = 5; 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; defaultTarget* : INTEGER;
BEGIN BEGIN
arch := architecture.arch; arch := architecture.arch;

BIN
voc

Binary file not shown.

Binary file not shown.