From 8afa55222b8271d6c003c86e0ed6f95cba1a81af Mon Sep 17 00:00:00 2001 From: Ron Pedde Date: Sat, 15 Apr 2006 05:31:53 +0000 Subject: [PATCH] workaround for sh and bsd make, fixing ticket #65 --- configure.in | 2 +- contrib/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index dfb45cc0..ee64c127 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,7 @@ AC_FUNC_SETPGRP if test "x$prefix" != xNONE -a "x$prefix" != "x/usr"; then CONFFILE="$prefix/etc/mt-daapd.conf" else - if test "x$prefix" == "xNONE"; then + if test "x$prefix" = "xNONE"; then CONFFILE="/usr/local/etc/mt-daapd.conf" else CONFFILE="/etc/mt-daapd.conf" diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3f4054dc..b0e46b91 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -10,9 +10,9 @@ dbdir="/var/cache/mt-daapd" mt-daapd.conf: mt-daapd.conf.templ ../config.h if [ "$(prefix)" = "/usr" ]; then \ - sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],/var/cache/mt-daapd,g $< >$@; \ + sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],/var/cache/mt-daapd,g mt-daapd.conf.templ >$@; \ else \ - sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],$(prefix)/var/cache/mt-daapd,g $< >$@; \ + sed -e s,[@]prefix[@],$(prefix),g -e s,[@]dbdir[@],$(prefix)/var/cache/mt-daapd,g mt-daapd.conf.templ >$@; \ fi