2 files changed, 41 insertions, 45 deletions
diff --git a/ptranslate/Makefile.in b/ptranslate/main.mk.in
index f4bbbda..67655cc 100644
--- a/ptranslate/Makefile.in
+++ b/ptranslate/main.mk.in
@@ -17,42 +17,27 @@ ver = 1.9.0
 #  along with this program;  see the file COPYING.
 #  If not, see <http://www.gnu.org/licenses>.
 
-DESTDIR  = @DESTDIR@
-srcdir  = @srcdir@
-prefix  = @prefix@
-exec_prefix  = @exec_prefix@
-bindir  = @bindir@
-sbindir  = @sbindir@
-libexecdir  = @libexecdir@
-
-trans_srcdir  = @trans@
-
-INSTALL  = install
-MKDIR  = $(INSTALL) -d #mkdir -p
-INSTALL_PROGRAM  = $(INSTALL)
-INSTALL_DATA  = $(INSTALL) -m 644
-RM  = rm -f
-SED  = sed
-
+trans = @trans@
 all : translators ptranslate
 install : install-translators $(DESTDIR)$(bindir)/ptranslate
-.PHONY : translators
 .SUFFIXES : 
 VPATH = $(srcdir)
-
-translators         : ;	$(MAKE) -C $(trans_srcdir)
-install-translators : ;	$(MAKE) -C $(trans_srcdir) install
-remove-translators  : ;	$(MAKE) -C $(trans_srcdir) remove
-
-% : %.sh
-	$(INSTALL_PROGRAM) $< $@
-	$(SED) -i 's/@VER@/$ver/g' $@
-
-$(DESTDIR)$(bindir)/% : %
-	$(INSTALL_PROGRAM) $< $@
-
-Makefile : $(srcdir)/configure
-	$<
+filelist = \
+  COPYING \
+  configure \
+  Makefile.in \
+  ptranslate.sh \
+  translators-hurd \
+  translators-posix \
+  translators-posix/Makefile.in \
+  translators-posix/x-bzip2.sh \
+  translators-posix/x-gzip.sh \
+  translators-posix/x-tar.sh
+
+.PHONY : translators install-translators remove-translators
+translators         : ;	$(MAKE) -C $(trans)
+install-translators : ;	$(MAKE) -C $(trans) install
+remove-translators  : ;	$(MAKE) -C $(trans) remove
 
 remove: remove-translators
 	$(RM) $(bindir)/ptranslate
diff --git a/ptranslate/translators-posix/Makefile.in b/ptranslate/translators-posix/Makefile.in
index d6f8fa1..f897178 100644
--- a/ptranslate/translators-posix/Makefile.in
+++ b/ptranslate/translators-posix/Makefile.in
@@ -17,20 +17,24 @@
 #  along with this program;  see the file COPYING.
 #  If not, see <http://www.gnu.org/licenses>.
 
-DESTDIR  = @DESTDIR@
-srcdir ?= @srcdir@
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
 mysrcdir = $(srcdir)/translators-posix
-prefix ?= @prefix@
-exec_prefix ?= @exec_prefix@
-bindir ?= @bindir@
-sbindir ?= @sbindir@
-libexecdir ?= @libexecdir@
 
-INSTALL ?= install
-MKDIR ?= $(INSTALL) -d #mkdir -p
-INSTALL_PROGRAM ?= $(INSTALL)
-INSTALL_DATA ?= $(INSTALL) -m 644
-RM ?= rm -f
+# Programs ###########################################################
+SHELL = /bin/sh
+INSTALL = install
+MKDIR = $(INSTALL) -d #mkdir -p
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+RM = rm -f
 
 all     : x-bzip2 x-gzip x-tar
 install : mime install-x-bzip2 install-x-gzip install-x-tar
@@ -64,10 +68,17 @@ $(DESTDIR)$(libexecdir)/media-types/multipart/%   : % mime; $(INSTALL_PROGRAM) $
 $(DESTDIR)$(libexecdir)/media-types/text/%        : % mime; $(INSTALL_PROGRAM) $< $@
 $(DESTDIR)$(libexecdir)/media-types/video/%       : % mime; $(INSTALL_PROGRAM) $< $@
 
-remove : 
+uninstall : 
 	$(RM) -r $(DESTDIR)$(libexecdir)/media-types
 
+# implicit rules #####################################################
+$(dirs) :
+	$(MKDIR) $@
+
 % : %.sh
+	$(SED) 's/@VER@/$ver/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $< $@
 
 Makefile : $(srcdir)/configure