[packages_10.03.2] mpdas: merge r27709, r27710, r28969

[10.03/packages.git] / sound / mpdas / patches / 001-flags.patch

diff --git a/sound/mpdas/patches/001-flags.patch b/sound/mpdas/patches/001-flags.patch
index f136683..11a6a6d 100644 (file)
--- a/sound/mpdas/patches/001-flags.patch
+++ b/sound/mpdas/patches/001-flags.patch
@@ -1,12 +1,19 @@
---- a/Makefile
-+++ b/Makefile
-@@ -7,8 +7,8 @@ PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/man/man1
- CONFIG = $(PREFIX)/etc
+Index: mpdas-0.3.0/Makefile
+===================================================================
+--- mpdas-0.3.0.orig/Makefile  2010-11-22 02:15:12.000000000 +0100
++++ mpdas-0.3.0/Makefile       2011-07-20 16:53:31.000000000 +0200
+@@ -3,12 +3,12 @@
+ CXX   ?= g++
+ OBJ   = main.o md5.o utils.o mpd.o audioscrobbler.o cache.o config.o
+ OUT   = mpdas
+-PREFIX ?= /usr/local
++PREFIX ?= /
+ MANPREFIX ?= ${PREFIX}/man/man1
+ CONFIG ?= $(PREFIX)/etc
  
 -CXXFLAGS      += `pkg-config --cflags libmpd libcurl` 
 -LIBS          = `pkg-config --libs libmpd libcurl`
-+CXXFLAGS      += $(CPPFLAGS) `pkg-config --cflags libmpd libcurl` 
++CXXFLAGS      += $(CPPFLAGS) `pkg-config --cflags libmpd libcurl`
 +LIBS          = $(LDFLAGS) `pkg-config --libs libmpd libcurl`
  
  CXXFLAGS      += -DCONFDIR="\"$(CONFIG)\"" -DVERSION="\"$(VERSION)\""