summaryrefslogtreecommitdiff
path: root/audio/pulseaudio/patches/patch-ad
blob: a295331c9abd49b191d9317ba9b35945a5444ef0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
$NetBSD: patch-ad,v 1.4 2010/02/01 15:00:20 jmcneill Exp $

--- src/Makefile.am.orig	2009-11-23 03:57:04.000000000 +0000
+++ src/Makefile.am
@@ -26,13 +26,13 @@
 
 pulseincludedir=$(includedir)/pulse
 pulsecoreincludedir=$(includedir)/pulsecore
-pulseconfdir=$(sysconfdir)/pulse
+pulseconfdir=$(EGDIR)
 pulselibexecdir=$(libexecdir)/pulse
-xdgautostartdir=$(sysconfdir)/xdg/autostart
+xdgautostartdir=$(PREFIX)/share/gnome/autostart
 alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
 alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
 udevrulesdir=/lib/udev/rules.d
-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+dbuspolicydir=$(EGDIR)
 
 ###################################
 #            Defines              #
@@ -42,7 +42,7 @@ PA_BINARY=$(bindir)/pulseaudio$(EXEEXT)
 if OS_IS_WIN32
 PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT%
 else
-PA_DEFAULT_CONFIG_DIR=$(pulseconfdir)
+PA_DEFAULT_CONFIG_DIR=$(sysconfdir)/pulse
 endif
 
 ###################################
@@ -1419,7 +1419,7 @@ module_x11_cork_request_la_LIBADD = $(AM
 # OSS
 
 liboss_util_la_SOURCES = modules/oss/oss-util.c modules/oss/oss-util.h
-liboss_util_la_LDFLAGS = -avoid-version
+liboss_util_la_LDFLAGS = -avoid-version $(LIBOSSAUDIO)
 liboss_util_la_LIBADD = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 
 module_oss_la_SOURCES = modules/oss/module-oss.c