diff --git a/log/Makefile b/log/Makefile
index 9f56885b10f8b4318c5e09a9a667a844d2af6389..158b3e6657744bf4108f579cd036a7dde361f1e3 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 1223006de11cc22338709daf84d180b43bd8cb28..7387c4cf0be229d3ba4b9a638561c80607e57765 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.