From b83a6abe01664245a2319c58b02063ba924fe912 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 21 Jan 2019 22:28:14 +0100
Subject: Configure/make: Quote variables that may contain spaces

This allows installing FLTK to directories that contain spaces.
---
 fluid/Makefile | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'fluid')

diff --git a/fluid/Makefile b/fluid/Makefile
index eb5b8c192..ae8037441 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,7 +1,7 @@
 #
 # FLUID Makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2023 by Bill Spitzak and others.
+# Copyright 1998-2024 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -97,45 +97,45 @@ include makedepend
 
 install: all
 	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
-	-$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+	-$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
+	$(INSTALL_BIN) $(FLUID) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)"
 
 install-linux:
-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
-	$(INSTALL_DATA) fluid.desktop  $(DESTDIR)/usr/share/applications
+	-$(INSTALL_DIR) "$(DESTDIR)$(datadir)/applications"
+	$(INSTALL_DATA) fluid.desktop "$(DESTDIR)$(datadir)/applications"
 	for size in 16 32 48 64 128; do \
-		if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
-			$(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
+		if test ! -d "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps"; then \
+			$(INSTALL_DIR) "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps"; \
 		fi; \
-		$(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+		$(INSTALL_DATA) icons/fluid-$$size.png "$(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png"; \
 	done
-	-$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
-	$(INSTALL_DATA) x-fluid.desktop  $(DESTDIR)/usr/share/mimelnk/application
+	-$(INSTALL_DIR) "$(DESTDIR)$(datadir)/mimelnk/application"
+	$(INSTALL_DATA) x-fluid.desktop "$(DESTDIR)$(datadir)/mimelnk/application"
 
 install-osx:
 	echo Installing Fluid in $(DESTDIR)/Applications...
-	-$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app
-	-$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents
-	$(INSTALL_DATA) fluid.app/Contents/Info.plist $(DESTDIR)/Applications/fluid.app/Contents/Info.plist
-	-$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/MacOS
-	$(RM) $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid
-	$(LN) $(bindir)/fluid $(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid
-	-$(INSTALL_DIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources
-	$(INSTALL_DATA) fluid.app/Contents/Resources/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources
+	-$(INSTALL_DIR) "$(DESTDIR)/Applications/fluid.app"
+	-$(INSTALL_DIR) "$(DESTDIR)/Applications/fluid.app/Contents"
+	$(INSTALL_DATA) fluid.app/Contents/Info.plist "$(DESTDIR)/Applications/fluid.app/Contents/Info.plist"
+	-$(INSTALL_DIR) "$(DESTDIR)/Applications/fluid.app/Contents/MacOS"
+	$(RM) "$(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid"
+	$(LN) "$(bindir)/fluid" "$(DESTDIR)/Applications/fluid.app/Contents/MacOS/fluid"
+	-$(INSTALL_DIR) "$(DESTDIR)/Applications/fluid.app/Contents/Resources"
+	$(INSTALL_DATA) fluid.app/Contents/Resources/fluid.icns "$(DESTDIR)/Applications/fluid.app/Contents/Resources"
 
 uninstall:
-	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+	$(RM) "$(DESTDIR)$(bindir)/fluid$(EXEEXT)"
 
 uninstall-linux:
-	$(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
-	$(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
-	$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
+	$(RM) "$(DESTDIR)$(datadir)/applications/fluid.desktop"
+	$(RM) "$(DESTDIR)$(datadir)/icons/hicolor"/*/fluid.png
+	$(RM) "$(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop"
 
 uninstall-osx:
-	$(RM) -r $(DESTDIR)/Applications/fluid.app
+	$(RM) -r "$(DESTDIR)/Applications/fluid.app"
 
 # Note: The rebuild target can only be used if you have the original .fl
-#	files. This is normally only used by the FLTK maintainers...
+#	files. This is normally only used by FLTK maintainers...
 #	It *must* be executed *after* fluid has been built and
 #	fluid must be rebuilt if any {.fl|.cxx|.h} files were changed.
 
-- 
cgit v1.2.3