From: Colin Guthrie <cguthrie@mandriva.org>
Date: Sun, 20 Mar 2011 11:18:19 +0000 (+0000)
Subject: Merge remote-tracking branch 'mkbosmans/mingw32-build'
X-Git-Tag: submit/2.0-panda/20130828.192557~772
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7ce59de88eda4eb638f977975374359254731f7;p=profile%2Fivi%2Fpulseaudio-panda.git

Merge remote-tracking branch 'mkbosmans/mingw32-build'
---

d7ce59de88eda4eb638f977975374359254731f7
diff --cc src/Makefile.am
index 78ee231,f160c94..fca7eda
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1917,16 -1898,23 +1918,23 @@@ system.pa: daemon/system.pa.in Makefil
  endif
  
  daemon.conf: daemon/daemon.conf.in Makefile
 -	sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
 +	$(AM_V_GEN) sed -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
  		-e 's,@PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
  
+ if OS_IS_WIN32
+ SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
+ 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
- 	ln -sf pacat $(DESTDIR)$(bindir)/parec
- 	ln -sf pacat $(DESTDIR)$(bindir)/pamon
- 	ln -sf pacat $(DESTDIR)$(bindir)/paplay
- 	ln -sf pacat $(DESTDIR)$(bindir)/parecord
+ 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)
+ 	$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT)
  	rm -f $(DESTDIR)$(libdir)/libpulsedsp.la
  	rm -f $(DESTDIR)$(modlibexecdir)/*.la