diff -ruN /tmp/sos-code-article8/Makefile ../sos-code-article8/Makefile
--- /tmp/sos-code-article8/Makefile	2005-07-01 16:39:47.000000000 +0200
+++ ../sos-code-article8/Makefile	2005-10-01 13:03:16.000000000 +0200
@@ -47,7 +47,7 @@
 KERNEL_OBJ   = sos.elf
 KERNEL_LOAD  = sos.gz
 MULTIBOOT_IMAGE = fd.img
-PWD := $(shell pwd)
+PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\$$/g')
 
 # Main target
 all: $(MULTIBOOT_IMAGE)
@@ -72,11 +72,11 @@
 
 # Create objects from C source code
 %.o: %.c
-	$(CC) -I$(PWD) -c $< $(CFLAGS) -o $@
+	$(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -o "$@"
 
 # Create objects from assembler (.S) source code
 %.o: %.S
-	$(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_SOURCE=1 -o $@
+	$(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -DASM_SOURCE=1 -o "$@"
 
 FORCE:
 	@
diff -ruN /tmp/sos-code-article8/userland/Makefile ../sos-code-article8/userland/Makefile
--- /tmp/sos-code-article8/userland/Makefile	2005-07-01 16:39:50.000000000 +0200
+++ ../sos-code-article8/userland/Makefile	2005-10-01 13:03:18.000000000 +0200
@@ -37,7 +37,7 @@
 fstest: fstest_utils.o
 $(PROGS) : % : %.o crt.o libc.a
 
-PWD := $(shell pwd)
+PWD := $(shell pwd | sed 's/"/\\\"/g;s/\$$/\\\$$/g')
 
 # Programs generation
 $(PROGS):
@@ -83,11 +83,11 @@
 
 # Create objects from C source code
 %.o: %.c
-	$(CC) -I$(PWD) -c $< $(CFLAGS) -o $@
+	$(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -o "$@"
 
 # Create objects from assembler (.S) source code
 %.o: %.S
-	$(CC) -I$(PWD) -c $< $(CFLAGS) -DASM_SOURCE=1 -o $@
+	$(CC) "-I$(PWD)" -c "$<" $(CFLAGS) -DASM_SOURCE=1 -o "$@"
 
 # Clean directory
 clean: