From a216a025ab95fa1acdb1cd14f638e10f8eeaf74e Mon Sep 17 00:00:00 2001
From: Romain 'Table' DROUIN <romaindrouin14@gmail.com>
Date: Fri, 24 Aug 2018 22:35:44 +0200
Subject: [PATCH] Fix Makefile with space in workdir
---
log/Makefile | 2 +-
psys/src/Makefile | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/log/Makefile b/log/Makefile
index 9f56885..158b3e6 100644
--- a/log/Makefile
+++ b/log/Makefile
@@ -51,7 +51,7 @@ CHIPMUNKFLAGS = $(ARCH_OPT)
STDC = gnu11
CFLAGS = $(CHIPMUNKFLAGS) -I$(LOGINC) -I$(LOCINC) -I$(XINCLUDEDIR) \
- -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0 -std=$(STDC) -g -Wall -Wextra
+ -DLOGLIB="\"$(LOGLIBDIR)\"" -DF_OK=0 -std=$(STDC) -g -Wall -Wextra
DIGOBJ = $(TARGET_DIR)/logsim.o $(TARGET_DIR)/logdig.o \
$(TARGET_DIR)/logsimasm.o $(TARGET_DIR)/logsimed.o \
diff --git a/psys/src/Makefile b/psys/src/Makefile
index 1223006..7387c4c 100644
--- a/psys/src/Makefile
+++ b/psys/src/Makefile
@@ -49,13 +49,13 @@ LOCINC = ../include
## XINCLUDEDIR = /usr/X11/include
##
## For OS X, this usually works:
-##
+##
## XINCLUDEDIR = /usr/X11R6/include
##
## For most versions of UNIX, one of the above directories
## will be the correct one to use on the line below:
-XINCLUDEDIR = .
+XINCLUDEDIR = .
##
@@ -169,7 +169,7 @@ CHIPMUNKFLAGS = $(ARCH_OPT)
OPTIONS = -Wall -Wextra
-CFLAGS = $(CHIPMUNKFLAGS) $(OPTIONS) $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
+CFLAGS = $(CHIPMUNKFLAGS) $(OPTIONS) $(FONTS) -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB="\"`$(CD) $(LIBDIR); pwd`\""
P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
@@ -181,7 +181,7 @@ P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
## For Apple Macintosh OS X, add the -c flag to CHIPMUNKRANFLAGS below.
##
-CHIPMUNKRANFLAGS =
+CHIPMUNKRANFLAGS =
## for systems without ranlib, you may wish to delete the lines:
##
@@ -213,7 +213,7 @@ p2clib.o: p2clib.c
clean:
-rm -f *.o libp2c.a ../libp2c.a
-
+
## The following part of the Makefile is for making a tar file of the
## original parts of the psys distribution. Most users have no need for it.
--
GitLab