Configure/make: Quote variables that may contain spaces

This allows installing FLTK to directories that contain spaces.

1 files changed, 131 insertions, 131 deletions

diff --git a/src/Makefile b/src/Makefile
index ff151ace5..2caf49923 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -853,248 +853,248 @@ install: $(LIBNAME) $(DSONAME) \
 	$(GLLIBNAME) $(GLDSONAME) \
 	$(IMGLIBNAME) $(IMGDSONAME)
 	echo "Installing libraries in $(DESTDIR)$(libdir)..."
-	-$(INSTALL_DIR) $(DESTDIR)$(libdir)
-	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
-	$(INSTALL_LIB) $(LIBNAME) $(DESTDIR)$(libdir)
-	$(INSTALL_LIB) $(FLLIBNAME) $(DESTDIR)$(libdir)
-	$(INSTALL_LIB) $(IMGLIBNAME) $(DESTDIR)$(libdir)
-	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBBASENAME)
-	$(RANLIB) $(DESTDIR)$(libdir)/$(FLLIBBASENAME)
+	-$(INSTALL_DIR) "$(DESTDIR)$(libdir)"
+	-$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+	$(RM) "$(DESTDIR)$(libdir)/$(LIBBASENAME)"
+	$(INSTALL_LIB) $(LIBNAME) "$(DESTDIR)$(libdir)"
+	$(INSTALL_LIB) $(FLLIBNAME) "$(DESTDIR)$(libdir)"
+	$(INSTALL_LIB) $(IMGLIBNAME) "$(DESTDIR)$(libdir)"
+	$(RANLIB) "$(DESTDIR)$(libdir)/$(LIBBASENAME)"
+	$(RANLIB) "$(DESTDIR)$(libdir)/$(FLLIBBASENAME)"
 	if test x$(GLLIBNAME) != x; then \
-		$(INSTALL_LIB) $(GLLIBNAME) $(DESTDIR)$(libdir); \
-		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBBASENAME); \
+		$(INSTALL_LIB) $(GLLIBNAME) "$(DESTDIR)$(libdir)"; \
+		$(RANLIB) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)"; \
 	fi
-	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME)
+	$(RANLIB) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)"
 	if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
-		$(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.so;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\
+		$(INSTALL_LIB) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk.so";\
 	fi
 	if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
-		$(INSTALL_LIB) libfltk.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk.sl;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk.sl*;\
+		$(INSTALL_LIB) libfltk.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk.sl";\
 	fi
 	if test x$(DSONAME) = xlibfltk.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
-		$(INSTALL_LIB) libfltk.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
-		$(LN) libfltk.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk.dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk.*dylib;\
+		$(INSTALL_LIB) libfltk.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk.dylib";\
 	fi
 	if test x$(DSONAME) = xlibfltk_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
-		$(INSTALL_LIB) libfltk_s.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_s.a";\
+		$(INSTALL_LIB) libfltk_s.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
-		$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
-		$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(DSONAME)";\
+		$(INSTALL_LIB) $(DSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
+		$(INSTALL_LIB) libfltk.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(DSONAME) = xmgwfltknox-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
-		$(INSTALL_LIB) $(DSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
-		$(INSTALL_LIB) libfltk.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(DSONAME)";\
+		$(INSTALL_LIB) $(DSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
+		$(INSTALL_LIB) libfltk.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
-		$(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk_forms.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.so;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.so*;\
+		$(INSTALL_LIB) libfltk_forms.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_forms.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_forms.so";\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
-		$(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk_forms.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_forms.sl;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.sl*;\
+		$(INSTALL_LIB) libfltk_forms.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_forms.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_forms.sl";\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\
-		$(INSTALL_LIB) libfltk_forms.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
-		$(LN) libfltk_forms.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_forms.dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.*dylib;\
+		$(INSTALL_LIB) libfltk_forms.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_forms.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk_forms.dylib";\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\
-		$(INSTALL_LIB) libfltk_forms_s.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms_s.a";\
+		$(INSTALL_LIB) libfltk_forms_s.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\
-		$(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
-		$(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)";\
+		$(INSTALL_LIB) $(FLDSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
+		$(INSTALL_LIB) libfltk_forms.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME);\
-		$(INSTALL_LIB) $(FLDSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
-		$(INSTALL_LIB) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)";\
+		$(INSTALL_LIB) $(FLDSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
+		$(INSTALL_LIB) libfltk_forms.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
-		$(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk_gl.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.so;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.so*;\
+		$(INSTALL_LIB) libfltk_gl.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_gl.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_gl.so";\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
-		$(INSTALL_LIB) libfltk_gl.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk_gl.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_gl.sl;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.sl*;\
+		$(INSTALL_LIB) libfltk_gl.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_gl.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_gl.sl";\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
-		$(INSTALL_LIB) libfltk_gl.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
-		$(LN) libfltk_gl.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_gl.dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.*dylib;\
+		$(INSTALL_LIB) libfltk_gl.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_gl.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk_gl.dylib";\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
-		$(INSTALL_LIB) libfltk_gl_s.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl_s.a";\
+		$(INSTALL_LIB) libfltk_gl_s.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\
-		$(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
-		$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)";\
+		$(INSTALL_LIB) $(GLDSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
+		$(INSTALL_LIB) libfltk_gl.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME);\
-		$(INSTALL_LIB) $(GLDSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
-		$(INSTALL_LIB) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)";\
+		$(INSTALL_LIB) $(GLDSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
+		$(INSTALL_LIB) libfltk_gl.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
-		$(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk_images.so.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.so;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_images.so*;\
+		$(INSTALL_LIB) libfltk_images.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_images.so.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_images.so";\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
-		$(INSTALL_LIB) libfltk_images.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir); \
-		$(LN) libfltk_images.sl.$(FL_DSO_VERSION) $(DESTDIR)$(libdir)/libfltk_images.sl;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_images.sl*;\
+		$(INSTALL_LIB) libfltk_images.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_images.sl.$(FL_DSO_VERSION) "$(DESTDIR)$(libdir)/libfltk_images.sl";\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
-		$(INSTALL_LIB) libfltk_images.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir); \
-		$(LN) libfltk_images.$(FL_DSO_VERSION).dylib $(DESTDIR)$(libdir)/libfltk_images.dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_images.*dylib;\
+		$(INSTALL_LIB) libfltk_images.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)"; \
+		$(LN) libfltk_images.$(FL_DSO_VERSION).dylib "$(DESTDIR)$(libdir)/libfltk_images.dylib";\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
-		$(INSTALL_LIB) libfltk_images_s.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images_s.a";\
+		$(INSTALL_LIB) libfltk_images_s.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
-		$(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
-		$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \
+		$(INSTALL_LIB) $(IMGDSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\
+		$(INSTALL_LIB) libfltk_images.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 	if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
-		$(INSTALL_LIB) $(IMGDSONAME) $(DESTDIR)$(bindir); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
-		$(INSTALL_LIB) libfltk_images.dll.a $(DESTDIR)$(libdir); \
+		$(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \
+		$(INSTALL_LIB) $(IMGDSONAME) "$(DESTDIR)$(bindir)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\
+		$(INSTALL_LIB) libfltk_images.dll.a "$(DESTDIR)$(libdir)"; \
 	fi
 
 
 uninstall:
 	echo "Uninstalling libraries..."
-	$(RM) $(DESTDIR)$(libdir)/$(LIBBASENAME)
+	$(RM) "$(DESTDIR)$(libdir)/$(LIBBASENAME)"
 	if test x$(DSONAME) = xlibfltk.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk.so*;\
 	fi
 	if test x$(DSONAME) = xlibfltk.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk.sl*;\
 	fi
 	if test x$(DSONAME) = xlibfltk.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk.*dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk.*dylib;\
 	fi
 	if test x$(DSONAME) = xlibfltk_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_s.a;\
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_s.a";\
 	fi
 	if test x$(DSONAME) = xcygfltknox-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(DSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
 	fi
 	if test x$(DSONAME) = xcygfltk-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(DSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
 	fi
 	if test x$(DSONAME) = xmgwfltknox-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(DSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(DSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk.dll.a";\
 	fi
-	$(RM) $(DESTDIR)$(libdir)/$(FLLIBBASENAME);
+	$(RM) "$(DESTDIR)$(libdir)/$(FLLIBBASENAME)";
 	if test x$(FLDSONAME) = xlibfltk_forms.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.so*;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.sl*;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.*dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_forms.*dylib;\
 	fi
 	if test x$(FLDSONAME) = xlibfltk_forms_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms_s.a;\
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms_s.a";\
 	fi
 	if test x$(FLDSONAME) = xcygfltknox_forms-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
 	fi
 	if test x$(FLDSONAME) = xcygfltk_forms-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
 	fi
 	if test x$(FLDSONAME) = xmgwfltknox_forms-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(FLDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(FLDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_forms.dll.a";\
 	fi
 	if test x$(GLLIBNAME) != x; then\
-		$(RM) $(DESTDIR)$(libdir)/$(GLLIBBASENAME);\
+		$(RM) "$(DESTDIR)$(libdir)/$(GLLIBBASENAME)";\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.so*;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.sl*;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.*dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_gl.*dylib;\
 	fi
 	if test x$(GLDSONAME) = xlibfltk_gl_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl_s.a;\
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl_s.a";\
 	fi
 	if test x$(GLDSONAME) = xcygfltknox_gl-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
 	fi
 	if test x$(GLDSONAME) = xcygfltk_gl-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
 	fi
 	if test x$(GLDSONAME) = xmgwfltknox_gl-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(GLDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(GLDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_gl.dll.a";\
 	fi
 	if test x$(IMGLIBNAME) != x; then\
-		$(RM) $(DESTDIR)$(libdir)/$(IMGLIBBASENAME);\
+		$(RM) "$(DESTDIR)$(libdir)/$(IMGLIBBASENAME)";\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.so.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_images.so*;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.sl.$(FL_DSO_VERSION); then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_images.sl*;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images.$(FL_DSO_VERSION).dylib; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.*dylib;\
+		$(RM) "$(DESTDIR)$(libdir)"/libfltk_images.*dylib;\
 	fi
 	if test x$(IMGDSONAME) = xlibfltk_images_s.a; then\
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images_s.a;\
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images_s.a";\
 	fi
 	if test x$(IMGDSONAME) = xcygfltknox_images-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\
 	fi
 	if test x$(IMGDSONAME) = xcygfltk_images-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\
 	fi
 	if test x$(IMGDSONAME) = xmgwfltknox_images-$(FL_DSO_VERSION).dll; then\
-		$(RM) $(DESTDIR)$(bindir)/$(IMGDSONAME); \
-		$(RM) $(DESTDIR)$(libdir)/libfltk_images.dll.a;\
+		$(RM) "$(DESTDIR)$(bindir)/$(IMGDSONAME)"; \
+		$(RM) "$(DESTDIR)$(libdir)/libfltk_images.dll.a";\
 	fi