[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[96]

[<dom...@us...>]

Revision: 96
          http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=96&view=rev
Author:   dominique_libre
Date:     2011-02-20 11:44:15 +0000 (Sun, 20 Feb 2011)

Log Message:
-----------
Test for introducing DESTDIR into the Makefile

Modified Paths:
--------------
    ChangeLog
    Makefile

Modified: ChangeLog
===================================================================
--- ChangeLog	2011-02-09 20:22:45 UTC (rev 95)
+++ ChangeLog	2011-02-20 11:44:15 UTC (rev 96)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+Dimanche 2' février 2011 Dominique Michel
+  * Introducing $(DESTDIR) into the Makefile
+
 Mercredi 9 février 2011 Dominique Michel
   * Fixed setting of Recipe preference under heavy system load
 

Modified: Makefile
===================================================================
--- Makefile	2011-02-09 20:22:45 UTC (rev 95)
+++ Makefile	2011-02-20 11:44:15 UTC (rev 96)
@@ -12,19 +12,19 @@
 
 install: uninstall correctpath
 	@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
-	mkdir -p $(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm 
+	mkdir -p $(DESTDIR)$(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm 
 
 	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(prefix)/bin
-	cp -d -r fvwm/* $(prefix)/share/fvwm-crystal/fvwm/
+	cp -d -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
 
-	mkdir -p $(prefix)/share/man/man1
-	cp -d -r man/* $(prefix)/share/man/man1
+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
+	cp -d -r man/* $(DESTDIR)$(prefix)/share/man/man1
 
 uninstall:
 	@echo "Uninstalling previously installed fvwm-crystal"
-	rm -rf $(prefix)/share/fvwm-crystal
-	rm -f $(prefix)/bin/fvwm-crystal.wallpaper $(prefix)/bin/fvwm-crystal.apps $(prefix)/bin/fvwm-crystal $(prefix)/bin/fvwm-crystal.generate-menu $(prefix)/bin/fvwm-crystal.infoline $(prefix)/bin/fvwm-crystal.mplayer-wrapper
-	rm -f $(prefix)/share/man/man1/ApplicationDatabase.1 $(prefix)/share/man/man1/CrystalRoxHOWTO.1 $(prefix)/share/man/man1/FVWMCrystalFAQ.1 $(prefix)/share/man/man1/KeyboardBindings.1 $(prefix)/share/man/man1/MouseBindings.1 $(prefix)/share/man/man1/Tips.1
+	rm -rf $(DESTDIR)$(prefix)/share/fvwm-crystal
+	rm -f $(DESTDIR)$(prefix)/bin/fvwm-crystal.wallpaper $(DESTDIR)$(prefix)/bin/fvwm-crystal.apps $(DESTDIR)$(prefix)/bin/fvwm-crystal $(DESTDIR)$(prefix)/bin/fvwm-crystal.generate-menu $(DESTDIR)$(prefix)/bin/fvwm-crystal.infoline $(DESTDIR)$(prefix)/bin/fvwm-crystal.mplayer-wrapper
+	rm -f $(DESTDIR)$(prefix)/share/man/man1/ApplicationDatabase.1 $(DESTDIR)$(prefix)/share/man/man1/CrystalRoxHOWTO.1 $(DESTDIR)$(prefix)/share/man/man1/FVWMCrystalFAQ.1 $(DESTDIR)$(prefix)/share/man/man1/KeyboardBindings.1 $(DESTDIR)$(prefix)/share/man/man1/MouseBindings.1 $(DESTDIR)$(prefix)/share/man/man1/Tips.1
 
 # This is meant for creating a distribution tarball from the repository and
 # not for the use by end users
@@ -194,11 +194,11 @@
 	sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
 
 uninstall-doc:
-	-rm -rf $(docdir)
-	-rm -rf $(addondir)
+	-rm -rf $(DESTDIR)$(docdir)
+	-rm -rf $(DESTDIR)$(addondir)
 
 install-doc:
-	mkdir -p $(addondir) $(docdir)
-	install -m 644 addons/* $(addondir)
-	install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(docdir)
-	install -m 644 doc/* $(docdir)
+	mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)
+	install -m 644 addons/* $(DESTDIR)$(addondir)
+	install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(DESTDIR)$(docdir)
+	install -m 644 doc/* $(DESTDIR)$(docdir)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.