diff -ruN mpgtx-1.3.orig/configure mpgtx-1.3/configure
--- mpgtx-1.3.orig/configure	2002-08-30 18:03:12.000000000 +0200
+++ mpgtx-1.3/configure	2003-03-17 20:46:52.000000000 +0100
@@ -7,12 +7,11 @@
 #################################################
 
 prefix="/usr/local"
-manprefix="/usr/local"
 #compiler flags
 CC="g++"
 common_cflags="-pedantic -Wall"
 devel_cflags="-g -Werror -fno-builtin"
-optimization_cflags="-O3"
+optimization_cflags="-O2"
 release_cflags=$optimization_cflags
 OFLAGS="-ansi"
 cflags=$common_cflags
@@ -28,9 +27,6 @@
 static="no"
 LFS="yes"
 
-# cp flags
-cpflags="d"
-
 # some stuff for MacOSX -----------------------------
 HOSTNAME=$(./config.guess)
 
@@ -53,9 +49,6 @@
 static="no"
 LFS="yes"
 
-#cp flags macosx does not know about cp -d !
-cpflags=""
-
 fi
 
 #################################################
@@ -129,17 +122,6 @@
 #                                               #
 #################################################
 
-# test if compiler is gcc version 3
-# if so change optimization flags to -O2 
-# gcc 3 does not seem to like -O3 with mpgtx very much 
-
-# next line is from Chris Danis
-gcc_major=`gcc --version | cut -b 1`
-
-if test $gcc_major = "3"; then
-	optimization_cflags="-O2";
-fi
-
 # Now check if the system handles large file support
 # unless user has specified not to do so
 if test $LFS = "yes"; then
@@ -226,8 +208,7 @@
 
 echo "PREFIX=$prefix" >> $makefilename
 echo "OFLAGS=$OFLAGS" >> $makefilename
-echo "manprefix=$manprefix" >> $makefilename
-echo "cpflags=$cpflags" >> $makefilename
+echo "manprefix=$prefix" >> $makefilename
 
 cat << EOF >>$makefilename
 INSTALLDIR=\$(PREFIX)/bin
@@ -299,14 +280,14 @@
 	ln -sf mpgtx mpginfo  
 	ln -sf mpgtx mpgdemux
 	ln -sf mpgtx tagmp3
-	install -d -m 755  \$(INSTALLDIR)
-	install -d -m 755  \$(MANDIR)
-	install -s -m 755 mpgtx \$(INSTALLDIR)
-	cp -\$(cpflags)f mpgdemux mpgjoin mpgcat mpginfo mpgsplit tagmp3 \$(INSTALLDIR)
-	install -m 644 man/mpgtx.1 man/tagmp3.1 \$(MANDIR) 
+	install -d -m 755  \$(DESTDIR)\$(INSTALLDIR)
+	install -d -m 755  \$(DESTDIR)\$(MANDIR)
+	install -s -m 755 mpgtx \$(DESTDIR)\$(INSTALLDIR)
+	cp -df mpgdemux mpgjoin mpgcat mpginfo mpgsplit tagmp3 \$(DESTDIR)\$(INSTALLDIR)
+	install -m 644 man/mpgtx.1 man/tagmp3.1 \$(DESTDIR)\$(MANDIR) 
 	cd man ; make
 	cd ..
-	cp -\$(cpflags)f ./man/mpgdemux.1 ./man/mpgjoin.1 man/mpgsplit.1 man/mpgcat.1 man/mpginfo.1 \$(MANDIR)
+	cp -f ./man/mpgdemux.1 ./man/mpgjoin.1 man/mpgsplit.1 man/mpgcat.1 man/mpginfo.1 \$(DESTDIR)\$(MANDIR)
 
 
 uninstall:
diff -ruN mpgtx-1.3.orig/man/Makefile mpgtx-1.3/man/Makefile
--- mpgtx-1.3.orig/man/Makefile	2002-08-30 18:03:12.000000000 +0200
+++ mpgtx-1.3/man/Makefile	2003-03-17 20:46:20.000000000 +0100
@@ -1,8 +1,8 @@
 all:
-	ln -sf mpgtx.1 mpgcat.1
-	ln -sf mpgtx.1 mpgjoin.1
-	ln -sf mpgtx.1 mpginfo.1
-	ln -sf mpgtx.1 mpgsplit.1
-	ln -sf mpgtx.1 mpgdemux.1
+	echo ".so man1/mpgtx.1" > mpgcat.1
+	echo ".so man1/mpgtx.1" > mpgjoin.1
+	echo ".so man1/mpgtx.1" > mpginfo.1
+	echo ".so man1/mpgtx.1" > mpgsplit.1
+	echo ".so man1/mpgtx.1" > mpgdemux.1
 clean:
 	rm mpgcat.1 mpgjoin.1 mpginfo.1 mpgsplit.1 mpgdemux.1