From 1dc6c0a57d104380d402f814620086ff6f70eaec Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Fri, 18 Jan 2013 21:46:43 +0000 Subject: [PATCH] src/Makefile.am: Don't make 'install' depend on 'all'. This fixes the issue where installing will re-generate the voices and may sometimes fail setting up the shadow directories in the espeak-data folder. --- Makefile.am | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a6a4ca5e..df16e17e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST += ChangeLog all: src/speak src/libespeak.so src/libespeak.a src/espeak src/espeakedit espeak-data/phontab dictionaries docs/speak_lib.h -install: all +install: cd src && make DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) BINDIR=$(BINDIR) INCDIR=$(INCDIR) LIBDIR=$(LIBDIR) install && cd .. install -m 755 src/espeakedit $(DESTDIR)$(BINDIR) diff --git a/src/Makefile.am b/src/Makefile.am index 1341d4d4..29d29c3c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -135,7 +135,7 @@ distclean: clean rm -f $(STATIC_LIBESPEAK) rm -f $(ESPEAKEDIT) -install: all +install: rm -rf $(DESTDIR)$(DATADIR) $(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(LIBDIR)