gnome-audio r44 - in trunk: . sounds

[hadess svn gnome org]

Author: hadess
Date: Tue Mar 25 15:06:26 2008
New Revision: 44
URL: http://svn.gnome.org/viewvc/gnome-audio?rev=44&view=rev

Log:
2008-03-25  Bastien Nocera  <hadess hadess net>

	* Makefile: 2.22.1
	* sounds/Makefile: patch from Damien Carbery
	<damien carbery sun com> to use DESTDIR appropriately



Modified:
   trunk/ChangeLog
   trunk/Makefile
   trunk/sounds/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Mar 25 15:06:26 2008
@@ -1,4 +1,4 @@
-VERSION=2.22.0
+VERSION=2.22.1
 DD=gnome-audio-$(VERSION)
 
 all: gnome-audio.spec

Modified: trunk/sounds/Makefile
==============================================================================
--- trunk/sounds/Makefile	(original)
+++ trunk/sounds/Makefile	Tue Mar 25 15:06:26 2008
@@ -12,10 +12,10 @@
 
 install-files:
 	for I in *.wav */*.wav ; do \
-		$(MKINSTALLDIRS) $(datadir)/sounds/`dirname $$I`; \
-		$(INSTALL_DATA) $$I $(datadir)/sounds/$$I; \
+		$(MKINSTALLDIRS) $(DESTDIR)/$(datadir)/sounds/`dirname $$I`; \
+		$(INSTALL_DATA) $$I $(DESTDIR)/$(datadir)/sounds/$$I; \
 	done
 
 install-default-links:
-	$(LN_S) startup3.wav $(datadir)/sounds/login.wav
-	$(LN_S) shutdown1.wav $(datadir)/sounds/logout.wav
+	$(LN_S) startup3.wav $(DESTDIR)/$(datadir)/sounds/login.wav
+	$(LN_S) shutdown1.wav $(DESTDIR)/$(datadir)/sounds/logout.wav