2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c33c1fa..8d57c45 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ TRANSLATIONS = pt fr eo es
 CONTRIBLANGS =
 PREFIX       = /usr/local
 BINDIR       = $(PREFIX)/bin
-LIBEXECDIR   = $(PREFIX)/libexec
+LIBEXECDIR   = $(PREFIX)/libexec/$(NAME)
 SHAREDIR     = $(PREFIX)/share
 LOCALEDIR    = $(SHAREDIR)/locale
 MANDIR       = $(SHAREDIR)/man
@@ -89,11 +89,11 @@ clean:
 
 install: all
 	mkdir -p \
-		$(DESTDIR)$(BINDIR)             \
-		$(DESTDIR)$(LIBEXECDIR)/$(NAME) \
+		$(DESTDIR)$(BINDIR)     \
+		$(DESTDIR)$(LIBEXECDIR) \
 		$(DESTDIR)$(LOCALEDIR)
 	cp src/$(NAME) $(DESTDIR)$(BINDIR)
-	cp src/locale/load-messages.sh $(DESTDIR)$(LIBEXECDIR)/$(NAME)
+	cp src/locale/load-messages.sh $(DESTDIR)$(LIBEXECDIR)
 	for l in $(TRANSLATIONS) en $(CONTRIBLANGS); do \
 		mkdir -p $(DESTDIR)$(LOCALEDIR)/$$l/LC_MESSAGES/$(NAME); \
 		cp \
@@ -105,7 +105,7 @@ install: all
 uninstall:
 	rm -f \
 		$(DESTDIR)$(BINDIR)/$(NAME) \
-		$(DESTDIR)$(LIBEXECDIR)/$(NAME)/load-messages.sh
+		$(DESTDIR)$(LIBEXECDIR)/load-messages.sh
 	for l in $(TRANSLATIONS) en $(CONTRIBLANGS); do \
 		rm -f $(DESTDIR)$(LOCALEDIR)/$$l/LC_MESSAGES/$(NAME)/*; \
 	done
diff --git a/src/td.in b/src/td.in
index db74a82..c6a7e9f 100755
--- a/src/td.in
+++ b/src/td.in
@@ -128,8 +128,8 @@ if [ -n "${TD_DUMP_TRANSLATABLE_STRINGS:-}" ]; then
 	exit
 fi
 
-if [ -r '@LIBEXECDIR@/@NAME@/load-messages.sh' ]; then
-	. '@LIBEXECDIR@/@NAME@/load-messages.sh'
+if [ -r '@LIBEXECDIR@/load-messages.sh' ]; then
+	. '@LIBEXECDIR@/load-messages.sh'
 fi