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

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

Revision: 496
          http://sourceforge.net/p/fvwm-crystal/code/496
Author:   dominique_libre
Date:     2013-06-04 07:59:41 +0000 (Tue, 04 Jun 2013)
Log Message:
-----------
 Makefile: fix for successive installations with different install prefixes

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

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-06-04 07:11:12 UTC (rev 495)
+++ ChangeLog	2013-06-04 07:59:41 UTC (rev 496)
@@ -2,6 +2,7 @@
 
 Mardi 4 Juin 2013 Dominique Michel
   Makefile: fix make uninstall of fvwm-crystal man page
+  Makefile: fix for successive installations with different install prefixes
   
 Samedi 1 Jui 2013 Dominique michel
   INSTALL: updated

Modified: Makefile
===================================================================
--- Makefile	2013-06-04 07:11:12 UTC (rev 495)
+++ Makefile	2013-06-04 07:59:41 UTC (rev 496)
@@ -14,9 +14,10 @@
 	@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
 	mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm $(DESTDIR)$(prefix)/share/xsessions $(DESTDIR)/etc/X11/Sessions
 
-	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 bin/fvwm-crystal.play-movies bin/fvwm-crystal.videomodeswitch- bin/fvwm-crystal.videomodeswitch+ $(DESTDIR)$(prefix)/bin
+	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper bin/fvwm-crystal.play-movies bin/fvwm-crystal.videomodeswitch- bin/fvwm-crystal.videomodeswitch+ $(DESTDIR)$(prefix)/bin
+	install -m 755 tmp/fvwm-crystal.generate-menu $(DESTDIR)$(prefix)/bin
 	cp -d -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
-	cp shared/fvwm-crystal $(DESTDIR)/etc/X11/Sessions
+	cp tmp/fvwm-crystal $(DESTDIR)/etc/X11/Sessions
 	cp shared/fvwm-crystal.desktop $(DESTDIR)$(prefix)/share/xsessions
 
 	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
@@ -202,10 +203,13 @@
 
 # It is needed to adjust some path inside fvwm-crystal.generate-menu since this file must know the install path
 correctpath:
-	sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
-	sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
-	sed -i 's:SYSPREFS="/usr/share:SYSPREFS="$(prefix)/share:' bin/fvwm-crystal.generate-menu
-	sed -i 's:/usr/bin:$(prefix)/bin:' shared/fvwm-crystal
+	mkdir -p tmp
+	cp -f bin/fvwm-crystal.generate-menu tmp
+	cp -f shared/fvwm-crystal 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
 
 uninstall-doc:
 	-rm -rf $(DESTDIR)$(docdir)

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