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

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

Revision: 498
          http://sourceforge.net/p/fvwm-crystal/code/498
Author:   dominique_libre
Date:     2013-06-04 16:47:22 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
Makefile: make preferences/LastChoosenRecipe to respect ; thanks to Thomas Funk for pointing that out.

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-06-04 08:05:31 UTC (rev 497)
+++ ChangeLog	2013-06-04 16:47:22 UTC (rev 498)
@@ -4,6 +4,8 @@
   Makefile: fix make uninstall of fvwm-crystal man page
   Makefile: fix for successive installations with different install prefixes
   Makefile: added make clean section
+  Makefile: make preferences/LastChoosenRecipe to respect $prefix; thanks to
+  Thomas Funk for pointing that out.
   
 Samedi 1 Jui 2013 Dominique michel
   INSTALL: updated

Modified: Makefile
===================================================================
--- Makefile	2013-06-04 08:05:31 UTC (rev 497)
+++ Makefile	2013-06-04 16:47:22 UTC (rev 498)
@@ -22,6 +22,8 @@
 
 	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
 	cp -d -r man/* $(DESTDIR)$(prefix)/share/man/man1
+# restore the original file; needed for successive run
+	cp -f tmp/LastChoosenRecipe fvwm/preferences/LastChoosenRecipe
 
 uninstall: uninstall-doc
 	@echo "Uninstalling previously installed fvwm-crystal"
@@ -209,10 +211,12 @@
 	mkdir -p tmp
 	cp -f bin/fvwm-crystal.generate-menu tmp
 	cp -f shared/fvwm-crystal tmp
+	cp -f fvwm/preferences/LastChoosenRecipe tmp
 	sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
 	sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
 	sed -i 's:SYSPREFS="/usr/share:SYSPREFS="$(prefix)/share:' tmp/fvwm-crystal.generate-menu
 	sed -i 's:/usr/bin:$(prefix)/bin:' tmp/fvwm-crystal
+	sed -i 's:/usr/bin:$(prefix)/bin:' fvwm/preferences/LastChoosenRecipe
 
 uninstall-doc:
 	-rm -rf $(DESTDIR)$(docdir)

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