--- src/Makefile.orig 2014-02-02 10:58:11 UTC +++ src/Makefile @@ -1,8 +1,8 @@ # remove -fno-exceptions if it causes problems with stdio library on some platforms (ARM) -DATADIR=/usr/share/espeak-data +DATADIR=%%DATADIR%%/espeak-data -PREFIX=/usr +PREFIX?=/usr BINDIR=$(PREFIX)/bin INCDIR=$(PREFIX)/include/espeak LIBDIR=$(PREFIX)/lib @@ -27,7 +27,7 @@ MKDIR = mkdir -p # 'runtime' uses pulseaudio if it is running, else uses portaudio #AUDIO = runtime -AUDIO = portaudio +AUDIO?= portaudio #AUDIO = portaudio0 #AUDIO = portaudio2 #AUDIO = pulseaudio @@ -35,17 +35,17 @@ AUDIO = portaudio ifeq ($(AUDIO),runtime) WAVE=wave.cpp wave_pulse.cpp -LIB_AUDIO=-lpulse -lpulse-simple -lportaudio +LIB_AUDIO=-L$(LOCALBASE)/lib -lpulse -lpulse-simple -lportaudio USE_AUDIO=-DUSE_PULSEAUDIO -DUSE_PORTAUDIO else ifeq ($(AUDIO),pulseaudio) WAVE=wave_pulse.cpp -LIB_AUDIO=-lpulse +LIB_AUDIO=-L$(LOCALBASE)/lib -lpulse USE_AUDIO=-DUSE_PULSEAUDIO else ifeq ($(AUDIO),portaudio) WAVE=wave.cpp -LIB_AUDIO=-lportaudio +LIB_AUDIO=-L$(LOCALBASE)/lib -lportaudio USE_AUDIO=-DUSE_PORTAUDIO else ifeq ($(AUDIO),portaudio0) @@ -91,9 +91,9 @@ LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread SRCS3 = espeak.cpp OBJS3=$(patsubst %.cpp,%.o,$(SRCS3)) -LIBS3=-lstdc++ -L . -lespeak +LIBS3=-lstdc++ -L . -lespeak -lpthread -CXXFLAGS=-O2 +CXXFLAGS?=-O2 all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME) @@ -133,7 +133,7 @@ distclean: clean install: all # Create directories - rm -rf $(DESTDIR)$(DATADIR) + #rm -rf $(DESTDIR)$(DATADIR) $(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(LIBDIR) $(MKDIR) $(DESTDIR)$(INCDIR) @@ -149,5 +149,5 @@ install: all # Install development headers $(INSTALL) -pm 644 speak_lib.h $(DESTDIR)$(INCDIR) # Install data files - cp -prf ../espeak-data/* $(DESTDIR)$(DATADIR) + cp -pRf ../espeak-data/* $(DESTDIR)$(DATADIR)