blob: 7ed07b969d7aeeccde219f1faab4e6ec45c5fa20 (
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
40
41
42
43
|
$NetBSD: patch-ad,v 1.5 2010/07/04 17:41:58 tron Exp $
--- src/Makefile.am.orig 2009-11-23 03:57:04.000000000 +0000
+++ src/Makefile.am 2010-07-04 18:05:42.000000000 +0100
@@ -26,13 +26,17 @@
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
+if HAVE_UDEV
udevrulesdir=/lib/udev/rules.d
-dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+else
+udevrulesdir=
+endif
+dbuspolicydir=$(EGDIR)
###################################
# Defines #
@@ -42,7 +46,7 @@
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 +1423,7 @@
# 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
|
