From 63cc9393a3f66cdd4773de55dd16c51f35ecc9a5 Mon Sep 17 00:00:00 2001
From: Henri Herscher <henri@oreka.org>
Date: Mon, 21 Nov 2005 04:45:52 +0000
Subject: Changed default prefix. executables and libraries are now installed
 in /usr/bin and /usr/lib instead of /usr/local/xxx

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@59 09dcff7a-b715-0410-9601-b79a96267cd0
---
 orkaudio/Makefile.am               | 2 +-
 orkaudio/config-linux-template.xml | 4 ++--
 orkaudio/configure.in              | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am
index b8b914a..7159c4d 100644
--- a/orkaudio/Makefile.am
+++ b/orkaudio/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 
-bin_PROGRAMS = orkaudio
+sbin_PROGRAMS = orkaudio
 orkaudio_LDADD =
 orkaudio_LDFLAGS = -lsndfile -lACE -lxerces-c -llog4cxx -lorkbase 
 orkaudio_SOURCES = OrkAudio.cpp AudioTape.cpp \
diff --git a/orkaudio/config-linux-template.xml b/orkaudio/config-linux-template.xml
index fee0c32..68e314e 100644
--- a/orkaudio/config-linux-template.xml
+++ b/orkaudio/config-linux-template.xml
@@ -9,7 +9,7 @@
 	<ClientTimeout>1000</ClientTimeout>
 
 	<!-- Use the following if oreka has been installed (having run "make install") -->
-	<CapturePluginPath>/usr/local/lib</CapturePluginPath>
+	<CapturePluginPath>/usr/lib</CapturePluginPath>
 	<CapturePlugin>libvoip.so</CapturePlugin>
 	<!-- Use the following if you run oreka uninstalled (without having run "make install") -->
 	<!--<CapturePluginPath>audiocaptureplugins/voip/.libs</CapturePluginPath>-->
@@ -17,7 +17,7 @@
 
 	<StorageAudioFormat>gsm</StorageAudioFormat>
 	<NumBatchThreads></NumBatchThreads>
-	<DeleteNativeFile>no</DeleteNativeFile>
+	<DeleteNativeFile>yes</DeleteNativeFile>
 	<AudioSegmentation>false</AudioSegmentation>
 	<AudioSegmentDuration>10</AudioSegmentDuration>
 	<VoIpPlugin>
diff --git a/orkaudio/configure.in b/orkaudio/configure.in
index b92725d..b07e008 100644
--- a/orkaudio/configure.in
+++ b/orkaudio/configure.in
@@ -7,4 +7,6 @@ AC_LANG_CPLUSPLUS
 AC_PROG_CXX
 AM_PROG_LIBTOOL
 
+AC_PREFIX_DEFAULT(/usr)
+
 AC_OUTPUT(Makefile messages/Makefile audiofile/Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile)
-- 
cgit v1.2.3