From 545aefd2505cdd79ca9dfe4564250d958f90ec85 Mon Sep 17 00:00:00 2001
From: kappa <kappa10@tutanota.com>
Date: Sun, 10 Feb 2019 22:33:16 +0100
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BC=D0=BE=D0=B3=D1=83=D1=9B=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=87=D0=B8=D1=82=D0=B0=D1=9A=D0=B5=20=D0=B1?=
 =?UTF-8?q?=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20DESTDIR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile    | 2 +-
 cirilisp.c  | 2 +-
 internals.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c6a7d21..344170d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ PREFIX = /usr/local
 LIBPREFIX = $(PREFIX)/lib
 
 # флегови за C компајлер и линкер
-CPPFLAGS = -D_POSIX_C_SOURCE=200200L
+CPPFLAGS = -D_POSIX_C_SOURCE=200200L -DDESTDIR=\"$(DESTDIR)\"
 # CFLAGS = -g -std=c99 -pedantic -Wall -O0
 CFLAGS  = -std=c99 -pedantic -Wall -O3
 LDFLAGS = -lm -lc
diff --git a/cirilisp.c b/cirilisp.c
index 01361ae..e10390e 100644
--- a/cirilisp.c
+++ b/cirilisp.c
@@ -61,7 +61,7 @@ void init()
 	addSymbolInternal("конс", &consInt, 0);
 	addSymbolInternal("јед?", &eqvQInt, 0);
 
-	if (!load("/usr/local/lib/cirilisp/инит.ћ"))
+	if (!load(DESTDIR"/usr/local/lib/cirilisp/инит.ћ"))
 	{
 		fprintf(stderr, "Није пронађена стандардна ЋИРЛИСП библиотека\
 \nПрограм се није могао правилно покренути\n");
diff --git a/internals.c b/internals.c
index e0008a6..488adc2 100644
--- a/internals.c
+++ b/internals.c
@@ -568,8 +568,8 @@ object eqvQInt(object parameters)
 				STR(CAR(CDR(parameters))));
 			break;
 		case charObject:
-			BOOL(result) = CHAR(CAR(parameters)) ==
-				CHAR(CAR(CDR(parameters)));
+			BOOL(result) = CHR(CAR(parameters)) ==
+				CHR(CAR(CDR(parameters)));
 			break;
 		case consObject:
 		case procedureObject: