Separate the desktop install/uninstall stuff so that users that don't

want desktop integration (or don't have root access) will be able to
install/uninstall.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4752 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

Makefile

@@ -3,7 +3,7 @@
 #
 # Top-level makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2005 by Bill Spitzak and others.
+# Copyright 1998-2006 by Bill Spitzak and others.
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -45,6 +45,9 @@ install: makeinclude
 		(cd $$dir; $(MAKE) $(MFLAGS) install) || break;\
 	done
 
+install-desktop: makeinclude
+	cd fluid; $(MAKE) $(MFLAGS) $(INSTALL_DESKTOP)
+
 uninstall: makeinclude
 	$(RM) $(DESTDIR)$(bindir)/fltk-config
 	for dir in FL $(DIRS); do\
@@ -52,6 +55,9 @@ uninstall: makeinclude
 		(cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\
 	done
 
+uninstall-desktop: makeinclude
+	cd fluid; $(MAKE) $(MFLAGS) $(UNINSTALL_DESKTOP)
+
 depend: makeinclude
 	for dir in $(DIRS); do\
 		echo "=== making dependencies in $$dir ===";\

fltk.spec

@@ -72,7 +72,7 @@ make
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 
-make -e prefix=$RPM_BUILD_ROOT/%{prefix} mandir=$RPM_BUILD_ROOT/%{_mandir} install
+make -e DESTDIR=$RPM_BUILD_ROOT install install-desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT

fluid/Makefile

@@ -76,7 +76,7 @@ depend:	$(CPPFILES)
 # Automatically generated dependencies...
 include makedepend
 
-install: all $(INSTALL_DESKTOP)
+install: all
 	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
 	-$(MKDIR) $(DESTDIR)$(bindir)
 	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
@@ -104,7 +104,7 @@ install-osx:
 	-$(MKDIR) $(DESTDIR)/Applications/fluid.app/Contents/Resources
 	$(CP) icons/fluid.icns $(DESTDIR)/Applications/fluid.app/Contents/Resources
 
-uninstall: $(UNINSTALL_DESKTOP)
+uninstall:
 	$(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
 
 uninstall-linux: