From 3a8670dcec87885e721ad9328f8d7c69da8a3d6e Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Sun, 27 Jul 2003 08:16:59 +0000
Subject: [PATCH] Makefile will now try to install Tux Paint launcher icon for
 gnome in $GNOME_PREFIX=/usr if gnome-config isn't available.

---
 Makefile         | 5 +++++
 docs/CHANGES.txt | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index da2b76a99..21396b273 100644
--- a/Makefile
+++ b/Makefile
@@ -193,6 +193,9 @@ uninstall:
 	-if [ "x$(GNOME_PREFIX)" != "x" ]; then \
 	  rm $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
 	  rm $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+	else \
+	  rm /usr/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	  rm /usr/share/pixmaps/tuxpaint.png; \
 	fi
 	-if [ "x$(KDE_PREFIX)" != "x" ]; then \
 	  rm $(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
@@ -256,6 +259,8 @@ install-gnome:
 	 install -d $(GNOME_PREFIX)/share/gnome/apps/Graphics; \
 	 cp src/tuxpaint.desktop $(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
 	 chmod 644 $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+	else \
+	 make install-gnome GNOME_PREFIX=/usr; \
 	fi
 
 
diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index 5c439d00f..34ea1caff 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -59,6 +59,10 @@ http://www.newbreedsoftware.com/tuxpaint/
   * iconv_close() was being called even if 'cd' was -1 (not set).  Fixed.
     Darrell Walisser <walisser@mac.com>
 
+  * If gnome-config is not found, it doesn't necessarily mean Gnome isn't being used!
+    Makefile will now fall-back and assume $GNOME_PREFIX should be /usr, so that the
+    launcher icon gets installed into the Gnome menu.
+
 
 2003.Jun.17 (0.9.11)
   * Windows bugfixes.