From bc6ae77abd052c599d664f46ef39ada3358ced24 Mon Sep 17 00:00:00 2001 From: moritz Date: Fri, 9 Mar 2007 13:43:26 +0000 Subject: [PATCH] Various tweakings, and sync Win32 README with new reality. git-svn-id: https://svn.xiph.org/trunk/ezstream@12698 0101bb08-14d6-0310-b084-bc0e0c8e3800 --- Makefile.am | 2 +- src/ezstream.c | 2 +- win32/Makefile.am | 2 ++ win32/README.win32 | 4 +--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index aedd2e9..d771dbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ dist_doc_DATA = COPYING NEWS README CLEANFILES = core *.core *~ .*~ -.PHONY: snapshot +.PHONY: regen-win32 snapshot regen-win32: cd win32; ${MAKE} regen-win32 diff --git a/src/ezstream.c b/src/ezstream.c index 0a1a15b..2d5440c 100644 --- a/src/ezstream.c +++ b/src/ezstream.c @@ -92,7 +92,7 @@ const int ezstream_signals[] = { SIGHUP, SIGUSR1, SIGUSR2 }; volatile sig_atomic_t rereadPlaylist = 0; volatile sig_atomic_t rereadPlaylist_notify = 0; volatile sig_atomic_t skipTrack = 0; -volatile sig_atomic_t queryMetadata = 0; +volatile sig_atomic_t queryMetadata = 0; #else int rereadPlaylist = 0; int rereadPlaylist_notify = 0; diff --git a/win32/Makefile.am b/win32/Makefile.am index bee486a..df7c979 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -6,5 +6,7 @@ CLEANFILES = core *.core *~ .*~ ezstream.1.pdf do_subst = sed -e 's,!!EXAMPLES_DIR!!,${PACKAGE_TARNAME}-${PACKAGE_VERSION}-win32/conf,g' +.PHONY: regen-win32 + regen-win32: Makefile $(do_subst) < $(top_srcdir)/doc/ezstream.1.in | nroff -Tps -mandoc - | ps2pdf - ezstream.1.pdf diff --git a/win32/README.win32 b/win32/README.win32 index 9220736..120d256 100644 --- a/win32/README.win32 +++ b/win32/README.win32 @@ -11,9 +11,7 @@ README.win32 - Information about the binary Ezstream distribution for Windows +======================================================================+ | \README.txt | This file. | +-----------------------+----------------------------------------------+ -| \ezstream.1.html | The ezstream manual in HTML format. It is | -| | automatically generated and looks very bad, | -| | but should be readable enough to be useful. | +| \ezstream.1.pdf | The ezstream manual in PDF format. | +-----------------------+----------------------------------------------+ | \ezstream.exe | The ezstream executable file. | +-----------------------+----------------------------------------------+