diff options
| author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-03-15 12:30:42 +0100 |
|---|---|---|
| committer | Maarten Bosmans <mkbosmans@gmail.com> | 2011-03-19 13:41:03 +0100 |
| commit | 09d7baec645c8720b9ba71fc1e8db6b35c3da943 (patch) | |
| tree | 3fe0cae8852fa5360afd2f4e58d9ed7671c5a5b1 | |
| parent | 74c934b1ada4c5e7d0efc690dc41d305abc2e58a (diff) | |
build: Protect some more variables by ifdefs
This avoids empty directories being created on builds without X11, ALSA, etc.
| -rw-r--r-- | src/Makefile.am | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9de5d4f1..2d73b72c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,10 +27,16 @@ pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore pulseconfdir=$(sysconfdir)/pulse pulselibexecdir=$(libexecdir)/pulse +if HAVE_X11 xdgautostartdir=$(sysconfdir)/xdg/autostart +endif +if HAVE_ALSA alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths +endif +if HAVE_DBUS dbuspolicydir=$(sysconfdir)/dbus-1/system.d +endif ################################### # Defines # @@ -117,9 +123,9 @@ if HAVE_X11 xdgautostart_in_files = \ daemon/pulseaudio.desktop.in \ daemon/pulseaudio-kde.desktop.in -endif xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +endif ################################### @@ -1902,8 +1908,10 @@ else SYMLINK_PROGRAM=ln -sf endif install-exec-hook: +if HAVE_BLUEZ -chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper -chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper +endif $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT) $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT) $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT) |