Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 946)
+++ trunk/src/Makefile.in	(revision 947)
@@ -276,11 +276,11 @@
 
 install_:
 	$(MKDIR) $(BINDIR) $(DATADIR)
-	$(CPC) `pwd`/pcb-rnd $(BINDIR)/pcb-rnd
-	$(CPC) `pwd`/default.pcb $(DATADIR)/default.pcb
-	$(CPC) `pwd`/default_font $(DATADIR)/default_font
-	$(CPC) `pwd`/gpcb-menu.res $(DATADIR)/gpcb-menu.res
-	$(CPC) `pwd`/pcb-menu.res $(DATADIR)/pcb-menu.res@/local/pcb/rules/install_@
+	$(CPC) "`pwd`/pcb-rnd" "$(BINDIR)/pcb-rnd"
+	$(CPC) "`pwd`/default.pcb" "$(DATADIR)/default.pcb"
+	$(CPC) "`pwd`/default_font" "$(DATADIR)/default_font"
+	$(CPC) "`pwd`/gpcb-menu.res" "$(DATADIR)/gpcb-menu.res"
+	$(CPC) "`pwd`/pcb-menu.res" "$(DATADIR)/pcb-menu.res@/local/pcb/rules/install_@"
 
 install:
 	make install_ CPC="$(CP)"@/local/pcb/rules/install@
Index: trunk/src/pcb-gpmi/Makefile
===================================================================
--- trunk/src/pcb-gpmi/Makefile	(revision 946)
+++ trunk/src/pcb-gpmi/Makefile	(revision 947)
@@ -21,6 +21,6 @@
 
 linstall:
 	-mkdir -p $(PLUGIN_DIR)/pcb-rnd-gpmi/
-	-ln -sf `pwd`/gpmi_plugin/gpmi_plugin.so $(PLUGIN_DIR)/gpmi_plugin.so
-	-for n in `ls gpmi_plugin/gpmi_pkg/*.h gpmi_plugin/gpmi_pkg/*.so`; do ln -sf `pwd`/$$n  $(PLUGIN_DIR)/pcb-rnd-gpmi/`basename $$n`; done
+	-ln -sf "`pwd`/gpmi_plugin/gpmi_plugin.so" "$(PLUGIN_DIR)/gpmi_plugin.so"
+	-for n in `ls gpmi_plugin/gpmi_pkg/*.h gpmi_plugin/gpmi_pkg/*.so`; do ln -sf "`pwd`/$$n"  "$(PLUGIN_DIR)/pcb-rnd-gpmi/`basename $$n`"; done