diff --git a/ChangeLog b/ChangeLog index ae12c763..a56da5d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ Tom Szilagyi * Add midiseq and midisine examples. * Cleanup old zombification code. + * Linux Makefile now install jack headers. 2007-10-25 Stephane Letz diff --git a/linux/Makefile b/linux/Makefile index 601dce31..789468ac 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -121,8 +121,11 @@ install: cp jack_alsa.so $(prefix)/$(libdir)/jackmp cp jack_dummy.so $(prefix)/$(libdir)/jackmp [ -f jack_freebob.so ] && cp jack_freebob.so $(prefix)/$(libdir)/jackmp || echo "freebob driver not installed" - cd $(prefix)/$(libdir) && [ -f libjack.so.0.0.23 ] && mv -f libjack.so.0.0.23 tmp_libjack.so.0.0.23 || echo "Jack not found, continue..." - cd $(prefix)/bin && [ -f jackd ] && mv -f jackd tmp_jackd || echo "jackd server not found" + cd $(prefix)/bin && [ -f jackd ] && mv -f jackd tmp_jackd || echo "jackd server not found, continue..." + cd $(prefix)/$(libdir) && [ -f libjack.so.0.0.23 ] && mv -f libjack.so.0.0.23 tmp_libjack.so.0.0.23 || echo "libjack not found, continue..." + cd $(prefix)/include && [ -d jack ] && mv -f jack tmp_jack || echo "jack headers not found, continue..." + install -d $(prefix)/include/jack/ + cp ../common/jack/*.h $(prefix)/include/jack/ cd $(prefix)/$(libdir) && rm -f libjack.so* cd $(prefix)/$(libdir) && ln -s libjackmp.so libjack.so cd $(prefix)/$(libdir) && ln -s libjackmp.so libjack.so.0 @@ -138,9 +141,10 @@ remove: rm $(prefix)/$(libdir)/libjackdmp.so rm -r $(prefix)/$(libdir)/jackmp cd $(prefix)/$(libdir) && rm -f libjack.so* + cd $(prefix)/bin && [ -f tmp_jackd ] && mv -f tmp_jackd jackd || echo "jackd server not restored, continue.." cd $(prefix)/$(libdir) && [ -f tmp_libjack.so.0.0.23 ] && mv -f tmp_libjack.so.0.0.23 libjack.so.0.0.23 \ - && ln -s libjack.so.0.0.23 libjack.so && ln -s libjack.so.0.0.23 libjack.so.0 || echo "libjack not restored" - cd $(prefix)/bin && [ -f tmp_jackd ] && mv -f tmp_jackd jackd || echo "jackd server not restored" + && ln -s libjack.so.0.0.23 libjack.so && ln -s libjack.so.0.0.23 libjack.so.0 || echo "libjack not restored, continue.." + cd $(prefix)/include && [ -d tmp_jack ] && mv -f tmp_jack jack || echo "jack headers not restored, continue..." /sbin/ldconfig clean :