ptranslate builds without make throwing errors

4 files changed, 88 insertions, 75 deletions

diff --git a/Makefile b/Makefile
index 94d0ec4..3ab342a 100644
--- a/Makefile
+++ b/Makefile
@@ -36,12 +36,12 @@ all :
 %/COPYING   : COPYING   %/; $(CP) $< $@
 %/configure : configure %/; $(CP) $< $@
 
-clean-mods   	= $(addprefix    clean-,$(mods))
-#complete-mods	= $(addprefix complete-,$(mods))
+clean-mods   	= $(addprefix     clean-,$(mods))
+distclean-mods   	= $(addprefix distclean-,$(mods))
 
-.PHONY : clean
-clean : $(clean-mods)
-clean-% : % %/
+.PHONY : distclean
+distclean : $(distclean-mods)
+distclean-% : % %/
 	$(RM) -r $<-build/
 	$(RM)    $</COPYING
 	$(RM)    $</configure
diff --git a/ptranslate/Makefile.in b/ptranslate/Makefile.in
index c8d51dd..f4bbbda 100644
--- a/ptranslate/Makefile.in
+++ b/ptranslate/Makefile.in
@@ -1,24 +1,23 @@
 #!/usr/bin/make -f
 name = ptranslate
 ver = 1.9.0
-#   Copyright (C) 2009 Luke Shumaker
-#   
-#   This file is part of pget.
-#   
-#   pget is free software; you can redistribute it and/or modify it under the
-#   terms of the GNU General Public License as published by the Free Software
-#   Foundation; either version 2, or (at your option) any later version.
-#   
-#   rvs is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#   See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public License
-#   along with rvs; see the file COPYING.
-#   If not, write to the Free Software Foundation,
-#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  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@
@@ -33,9 +32,10 @@ MKDIR  = $(INSTALL) -d #mkdir -p
 INSTALL_PROGRAM  = $(INSTALL)
 INSTALL_DATA  = $(INSTALL) -m 644
 RM  = rm -f
+SED  = sed
 
 all : translators ptranslate
-install : install-translators $(bindir)/ptranslate
+install : install-translators $(DESTDIR)$(bindir)/ptranslate
 .PHONY : translators
 .SUFFIXES : 
 VPATH = $(srcdir)
@@ -46,8 +46,9 @@ remove-translators  : ;	$(MAKE) -C $(trans_srcdir) remove
 
 % : %.sh
 	$(INSTALL_PROGRAM) $< $@
+	$(SED) -i 's/@VER@/$ver/g' $@
 
-$(bindir)/% : %
+$(DESTDIR)$(bindir)/% : %
 	$(INSTALL_PROGRAM) $< $@
 
 Makefile : $(srcdir)/configure
diff --git a/ptranslate/ptranslate.sh b/ptranslate/ptranslate.sh
index 0c377d1..dd2b275 100644
--- a/ptranslate/ptranslate.sh
+++ b/ptranslate/ptranslate.sh
@@ -1,14 +1,21 @@
 #!/bin/sh
 # pget translate
-ver="1.9.0"
-# 
-# Copyright (C) 2009 Luke Shumaker
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# Originally written by Luke Shumaker <lukeshu@sbcglobal.net>.
+ver=@VER@
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
 file="$1"
 echo "$file" >> /dev/stderr
diff --git a/ptranslate/translators-posix/Makefile.in b/ptranslate/translators-posix/Makefile.in
index 91f8c9c..d6f8fa1 100644
--- a/ptranslate/translators-posix/Makefile.in
+++ b/ptranslate/translators-posix/Makefile.in
@@ -1,24 +1,25 @@
 #!/usr/bin/make -f
-ver = 1.9.0
-#   Copyright (C) 2009 Luke Shumaker
-#   
-#   This file is part of pget.
-#   
-#   pget is free software; you can redistribute it and/or modify it under the
-#   terms of the GNU General Public License as published by the Free Software
-#   Foundation; either version 2, or (at your option) any later version.
-#   
-#   rvs is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#   See the GNU General Public License for more details.
-#   
-#   You should have received a copy of the GNU General Public License
-#   along with rvs; see the file COPYING.
-#   If not, write to the Free Software Foundation,
-#   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#name = ptranslate-unix
+#ver = 1.9.0
+#  Copyright (C) 2009 Luke Shumaker
+#  
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program;  see the file COPYING.
+#  If not, see <http://www.gnu.org/licenses>.
 
-srcdir ?= @srcdir@/translators
+DESTDIR  = @DESTDIR@
+srcdir ?= @srcdir@
+mysrcdir = $(srcdir)/translators-posix
 prefix ?= @prefix@
 exec_prefix ?= @exec_prefix@
 bindir ?= @bindir@
@@ -35,36 +36,40 @@ all     : x-bzip2 x-gzip x-tar
 install : mime install-x-bzip2 install-x-gzip install-x-tar
 .PHONY  : install-x-bzip2 install-x-gzip install-x-tar
 .SUFFIXES : 
-VPATH = $(srcdir)
+VPATH = $(mysrcdir)
+$(info $(VPATH))
 
 mime :
-	$(MKDIR) $(libexecdir)/media-types
-	$(MKDIR) $(libexecdir)/media-types/application
-	$(MKDIR) $(libexecdir)/media-types/audio
-	$(MKDIR) $(libexecdir)/media-types/image
-	$(MKDIR) $(libexecdir)/media-types/message
-	$(MKDIR) $(libexecdir)/media-types/model
-	$(MKDIR) $(libexecdir)/media-types/multipart
-	$(MKDIR) $(libexecdir)/media-types/text
-	$(MKDIR) $(libexecdir)/media-types/video
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/application
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/audio
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/image
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/message
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/model
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/multipart
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/text
+	$(MKDIR) $(DESTDIR)$(libexecdir)/media-types/video
 
 
-install-x-bzip2: $(libexecdir)/media-types/application/x-bzip2
-install-x-gzip : $(libexecdir)/media-types/application/x-gzip
-install-x-tar  : $(libexecdir)/media-types/application/x-tar
+install-x-bzip2: $(DESTDIR)$(libexecdir)/media-types/application/x-bzip2
+install-x-gzip : $(DESTDIR)$(libexecdir)/media-types/application/x-gzip
+install-x-tar  : $(DESTDIR)$(libexecdir)/media-types/application/x-tar
 
-$(libexecdir)/media-types/application/% : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/audio/%       : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/image/%       : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/message/%     : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/model/%       : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/multipart/%   : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/text/%        : % mime; $(INSTALL_PROGRAM) $< $@
-$(libexecdir)/media-types/video/%       : % mime; $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(libexecdir)/media-types/application/% : % mime; $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(libexecdir)/media-types/audio/%       : % mime; $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(libexecdir)/media-types/image/%       : % mime; $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(libexecdir)/media-types/message/%     : % mime; $(INSTALL_PROGRAM) $< $@
+$(DESTDIR)$(libexecdir)/media-types/model/%       : % mime; $(INSTALL_PROGRAM) $< $@
+$(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 : 
-	$(RM) -r $(libexecdir)/media-types
+	$(RM) -r $(DESTDIR)$(libexecdir)/media-types
 
 % : %.sh
 	$(INSTALL_PROGRAM) $< $@
 
+Makefile : $(srcdir)/configure
+	$<
+