From a24b46f8803ff8521e02d548a4c05cc67b0da8f2 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Fri, 18 Jan 2013 22:04:22 +0000
Subject: [PATCH] autotools: use the variables from autotools for the install
 locations.

---
 Makefile.am     | 18 +++++++++---------
 src/Makefile.am | 13 ++++++-------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 81ead14c..9f8f6855 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
-PREFIX=/usr
-BINDIR=$(PREFIX)/bin
-INCDIR=$(PREFIX)/include/espeak
-LIBDIR=$(PREFIX)/lib
+PREFIX=@prefix@
+BINDIR=@bindir@
+INCDIR=@includedir@/espeak
+LIBDIR=@libdir@
 DATADIR=$(PREFIX)/share/espeak-data
 
 PLATFORM=big_endian
@@ -88,19 +88,19 @@ docs/speak_lib.h: src/speak_lib.h
 	cp $< $@
 
 src/libespeak.a: $(common_SOURCE) $(libespeak_SOURCE)
-	cd src && make libespeak.a PREFIX=$(PREFIX) && cd ..
+	cd src && make libespeak.a && cd ..
 
 src/libespeak.so: $(common_SOURCE) $(libespeak_SOURCE)
-	cd src && make libespeak.so PREFIX=$(PREFIX) && cd ..
+	cd src && make libespeak.so && cd ..
 
 src/speak: $(common_SOURCE) src/speak.cpp
-	cd src && make speak PREFIX=$(PREFIX) && cd ..
+	cd src && make speak && cd ..
 
 src/espeak: src/libespeak.so src/espeak.cpp
-	cd src && make espeak PREFIX=$(PREFIX) && cd ..
+	cd src && make espeak && cd ..
 
 src/espeakedit: $(common_SOURCE) $(libespeak_SOURCE) $(espeakedit_SOURCE)
-	cd src && make espeakedit PREFIX=$(PREFIX) && cd ..
+	cd src && make espeakedit && cd ..
 
 espeak-phoneme-data:
 	cd platforms/$(PLATFORM) && make PREFIX=$(PREFIX) && cd ../..
diff --git a/src/Makefile.am b/src/Makefile.am
index 29d29c3c..5e30013f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,11 @@
+PREFIX=@prefix@
+BINDIR=@bindir@
+INCDIR=@includedir@/espeak
+LIBDIR=@libdir@
+DATADIR=${PREFIX}/share/espeak-data
+
 # remove -fno-exceptions  if it causes problems with stdio library on some platforms (ARM)
 
-DATADIR=/usr/share/espeak-data
-
-PREFIX=/usr
-BINDIR=$(PREFIX)/bin
-INCDIR=$(PREFIX)/include/espeak
-LIBDIR=$(PREFIX)/lib
-
 RELEASE = 1.46
 SPEAK = speak
 ESPEAK = espeak