--- branches/magellan-next/core/pulseaudio/pulseaudio-1.1-r2.smage2	2011/11/28 10:41:17	9372
+++ branches/magellan-next/core/pulseaudio/pulseaudio-1.1-r2.smage2	2011/11/28 13:10:22	9373
@@ -141,7 +141,7 @@
 src_compile()
 {
 	mconfigure \
-		--libexecdir=/usr/$(mlibdir)/${PNAME} \
+		--libexecdir=/usr/'$(mlibdir)'/${PNAME} \
 		--localstatedir=/var \
 		--with-udev-rules-dir=/lib/udev/rules.d \
 		--with-database=tdb \
@@ -206,80 +206,80 @@
 		usr/bin/pulseaudio \
 		usr/$(mlibdir)/libpulsecore-*.* \
 		usr/$(mlibdir)/pulseaudio \
-		usr/$(mlibdir)/pulse-${PVER}/*always* \
-		usr/$(mlibdir)/pulse-${PVER}/*augment* \
-		usr/$(mlibdir)/pulse-${PVER}/*card* \
-		usr/$(mlibdir)/pulse-${PVER}/*combine* \
-		usr/$(mlibdir)/pulse-${PVER}/*console* \
-		usr/$(mlibdir)/pulse-${PVER}/*cork* \
-		usr/$(mlibdir)/pulse-${PVER}/*cli* \
-		usr/$(mlibdir)/pulse-${PVER}/*dbus* \
-		usr/$(mlibdir)/pulse-${PVER}/*default* \
-		usr/$(mlibdir)/pulse-${PVER}/*detect* \
-		usr/$(mlibdir)/pulse-${PVER}/*echo* \
-		usr/$(mlibdir)/pulse-${PVER}/*equalizer* \
-		usr/$(mlibdir)/pulse-${PVER}/*filter* \
-		usr/$(mlibdir)/pulse-${PVER}/*hal* \
-		usr/$(mlibdir)/pulse-${PVER}/*http* \
-		usr/$(mlibdir)/pulse-${PVER}/*intended* \
-		usr/$(mlibdir)/pulse-${PVER}/*ladspa* \
-		usr/$(mlibdir)/pulse-${PVER}/*loopback* \
-		usr/$(mlibdir)/pulse-${PVER}/*match* \
-		usr/$(mlibdir)/pulse-${PVER}/*mmkbd* \
-		usr/$(mlibdir)/pulse-${PVER}/*native* \
-		usr/$(mlibdir)/pulse-${PVER}/*null* \
-		usr/$(mlibdir)/pulse-${PVER}/*pipe* \
-		usr/$(mlibdir)/pulse-${PVER}/*position* \
-		usr/$(mlibdir)/pulse-${PVER}/*remap* \
-		usr/$(mlibdir)/pulse-${PVER}/*rtp* \
-		usr/$(mlibdir)/pulse-${PVER}/*rygel* \
-		usr/$(mlibdir)/pulse-${PVER}/*simple* \
-		usr/$(mlibdir)/pulse-${PVER}/*sine* \
-		usr/$(mlibdir)/pulse-${PVER}/*stream* \
-		usr/$(mlibdir)/pulse-${PVER}/*suspend* \
-		usr/$(mlibdir)/pulse-${PVER}/*switch* \
-		usr/$(mlibdir)/pulse-${PVER}/*tunnel* \
-		usr/$(mlibdir)/pulse-${PVER}/*udev* \
-		usr/$(mlibdir)/pulse-${PVER}/*virtual* \
-		usr/$(mlibdir)/pulse-${PVER}/*volume* \
+		usr/$(mlibdir)/pulse-${PVER}/*always*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*augment*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*card*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*combine*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*console*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*cork*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*cli*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*dbus*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*default*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*detect*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*echo*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*equalizer*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*filter*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*hal*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*http*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*intended*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*ladspa*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*loopback*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*match*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*mmkbd*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*native*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*null*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*pipe*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*position*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*remap*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*rtp*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*rygel*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*simple*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*sine*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*stream*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*suspend*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*switch*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*tunnel*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*udev*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*virtual*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*volume*.so \
 		$([[ $(mlibdir) != lib ]] && echo "usr/lib/libpulsecore-*.*
 			usr/lib/pulseaudio
-			usr/lib/pulse-${PVER}/*always*
-			usr/lib/pulse-${PVER}/*augment*
-			usr/lib/pulse-${PVER}/*card*
-			usr/lib/pulse-${PVER}/*combine*
-			usr/lib/pulse-${PVER}/*console*
-			usr/lib/pulse-${PVER}/*cork*
-			usr/lib/pulse-${PVER}/*cli*
-			usr/lib/pulse-${PVER}/*dbus*
-			usr/lib/pulse-${PVER}/*default*
-			usr/lib/pulse-${PVER}/*detect*
-			usr/lib/pulse-${PVER}/*echo*
-			usr/lib/pulse-${PVER}/*equalizer*
-			usr/lib/pulse-${PVER}/*filter*
-			usr/lib/pulse-${PVER}/*hal*
-			usr/lib/pulse-${PVER}/*http*
-			usr/lib/pulse-${PVER}/*intended*
-			usr/lib/pulse-${PVER}/*ladspa*
-			usr/lib/pulse-${PVER}/*loopback*
-			usr/lib/pulse-${PVER}/*match*
-			usr/lib/pulse-${PVER}/*mmkbd*
-			usr/lib/pulse-${PVER}/*native*
-			usr/lib/pulse-${PVER}/*null*
-			usr/lib/pulse-${PVER}/*pipe*
-			usr/lib/pulse-${PVER}/*position*
-			usr/lib/pulse-${PVER}/*remap*
-			usr/lib/pulse-${PVER}/*rtp*
-			usr/lib/pulse-${PVER}/*rygel*
-			usr/lib/pulse-${PVER}/*simple*
-			usr/lib/pulse-${PVER}/*sine*
-			usr/lib/pulse-${PVER}/*stream*
-			usr/lib/pulse-${PVER}/*suspend*
-			usr/lib/pulse-${PVER}/*switch*
-			usr/lib/pulse-${PVER}/*tunnel*
-			usr/lib/pulse-${PVER}/*udev*
-			usr/lib/pulse-${PVER}/*virtual*
-			usr/lib/pulse-${PVER}/*volume*") \
+			usr/lib/pulse-${PVER}/*always*.so
+			usr/lib/pulse-${PVER}/*augment*.so
+			usr/lib/pulse-${PVER}/*card*.so
+			usr/lib/pulse-${PVER}/*combine*.so
+			usr/lib/pulse-${PVER}/*console*.so
+			usr/lib/pulse-${PVER}/*cork*.so
+			usr/lib/pulse-${PVER}/*cli*.so
+			usr/lib/pulse-${PVER}/*dbus*.so
+			usr/lib/pulse-${PVER}/*default*.so
+			usr/lib/pulse-${PVER}/*detect*.so
+			usr/lib/pulse-${PVER}/*echo*.so
+			usr/lib/pulse-${PVER}/*equalizer*.so
+			usr/lib/pulse-${PVER}/*filter*.so
+			usr/lib/pulse-${PVER}/*hal*.so
+			usr/lib/pulse-${PVER}/*http*.so
+			usr/lib/pulse-${PVER}/*intended*.so
+			usr/lib/pulse-${PVER}/*ladspa*.so
+			usr/lib/pulse-${PVER}/*loopback*.so
+			usr/lib/pulse-${PVER}/*match*.so
+			usr/lib/pulse-${PVER}/*mmkbd*.so
+			usr/lib/pulse-${PVER}/*native*.so
+			usr/lib/pulse-${PVER}/*null*.so
+			usr/lib/pulse-${PVER}/*pipe*.so
+			usr/lib/pulse-${PVER}/*position*.so
+			usr/lib/pulse-${PVER}/*remap*.so
+			usr/lib/pulse-${PVER}/*rtp*.so
+			usr/lib/pulse-${PVER}/*rygel*.so
+			usr/lib/pulse-${PVER}/*simple*.so
+			usr/lib/pulse-${PVER}/*sine*.so
+			usr/lib/pulse-${PVER}/*stream*.so
+			usr/lib/pulse-${PVER}/*suspend*.so
+			usr/lib/pulse-${PVER}/*switch*.so
+			usr/lib/pulse-${PVER}/*tunnel*.so
+			usr/lib/pulse-${PVER}/*udev*.so
+			usr/lib/pulse-${PVER}/*virtual*.so
+			usr/lib/pulse-${PVER}/*volume*.so") \
 		usr/share/man/man1/pulseaudio.1 \
 		usr/share/man/man5/default.pa.5 \	
 		usr/share/man/man5/pulse-daemon.conf.5 \
@@ -296,8 +296,8 @@
 	mmake DESTDIR=${BINDIR} install || die
 
 	zapmost ${BINDIR} \
-		usr/$(mlibdir)/pulse-${PVER}/*alsa* \
-		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*alsa*") \
+		usr/$(mlibdir)/pulse-${PVER}/*alsa*.so \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*alsa*.so") \
 		usr/share/pulseaudio/alsa-mixer \
 		|| die
 }
@@ -308,8 +308,8 @@
 
 	zapmost ${BINDIR} \
 		usr/bin/esdcompat \
-		usr/$(mlibdir)/pulse-${PVER}/*esound* \
-		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*esound*") \
+		usr/$(mlibdir)/pulse-${PVER}/*esound*.so \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*esound*.so") \
 		usr/share/pulseaudio/alsa-mixer \
 		usr/share/man/man1/esdcompat.1 \
 		|| die
@@ -320,10 +320,10 @@
 	mmake DESTDIR=${BINDIR} install || die
 
 	zapmost ${BINDIR} \
-		usr/$(mlibdir)/pulse-${PVER}/*avahi* \
-		usr/$(mlibdir)/pulse-${PVER}/*zeroconf* \
-		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*avahi*
-			usr/lib/pulse-${PVER}/*zeroconf*") \
+		usr/$(mlibdir)/pulse-${PVER}/*avahi*.so \
+		usr/$(mlibdir)/pulse-${PVER}/*zeroconf*.so \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*avahi*.so
+			usr/lib/pulse-${PVER}/*zeroconf*.so") \
 		|| die
 }
  
@@ -334,8 +334,8 @@
 	zapmost ${BINDIR} \
 		etc/xdg \
 		usr/bin/start-pulseaudio* \
-		usr/$(mlibdir)/pulse-${PVER}/*x11* \
-		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*x11*") \
+		usr/$(mlibdir)/pulse-${PVER}/*x11*.so \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*x11*.so") \
 		usr/share/man/man1/start-pulseaudio* \
 		|| die
 }
@@ -345,9 +345,9 @@
 	mmake DESTDIR=${BINDIR} install || die
 
 	zapmost ${BINDIR} \
-		usr/$(mlibdir)/pulse-${PVER}/*bluetooth* \
+		usr/$(mlibdir)/pulse-${PVER}/*bluetooth*.so \
 		usr/$(mlibdir)/pulseaudio/proximity-helper \
-		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*bluetooth*
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*bluetooth*.so
 			usr/lib/pulseaudio/proximity-helper") \
 		|| die	
 }
@@ -357,8 +357,8 @@
 	mmake DESTDIR=${BINDIR} install || die
 
 	zapmost ${BINDIR} \
-		usr/$(mlibdir)/pulse-${PVER}/*raop* \
-		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*raop*") \
+		usr/$(mlibdir)/pulse-${PVER}/*raop*.so \
+		$([[ $(mlibdir) != lib ]] && echo"usr/lib/pulse-${PVER}/*raop*.so") \
 		|| die	
 }