yann@1036: diff -durN ltrace-0.5.orig/Makefile.in ltrace-0.5/Makefile.in
yann@1036: --- ltrace-0.5.orig/Makefile.in	2006-03-14 00:12:01.000000000 +0100
yann@1036: +++ ltrace-0.5/Makefile.in	2008-11-04 19:23:05.000000000 +0100
yann@1036: @@ -2,8 +2,14 @@
yann@1036:  # ltrace's Makefile.in
yann@1036:  #
yann@1036:  
yann@1036: -#OS		:= $(shell uname -s)
yann@1036:  OS		:= @HOST_OS@
yann@1036: +ARCH		:= $(shell echo "@HOST_ARCH@" |sed -e s/i.86/i386/      \
yann@1036: +						   -e s/sun4u/sparc64/  \
yann@1036: +						   -e s/arm.*/arm/      \
yann@1036: +						   -e s/sa110/arm/      \
yann@1036: +						   -e s/ppc64/ppc/      \
yann@1036: +						   -e s/s390x/s390/)
yann@1036: +export ARCH
yann@1036:  
yann@1036:  TOPDIR		= $(shell pwd)
yann@1036:  
yann@1036: @@ -20,10 +26,10 @@
yann@1036:  LIBS		=	@LIBS@
yann@1036:  
yann@1036:  INSTALL		=	@INSTALL@
yann@1036: -INSTALL_FILE	=	$(INSTALL) -p    -o root -g root  -m  644
yann@1036: -INSTALL_PROGRAM	=	$(INSTALL) -p    -o root -g root  -m  755
yann@1036: -INSTALL_SCRIPT	=	$(INSTALL) -p    -o root -g root  -m  755
yann@1036: -INSTALL_DIR	=	$(INSTALL) -p -d -o root -g root  -m  755
yann@1036: +INSTALL_FILE	=	$(INSTALL) -p    -m  644
yann@1036: +INSTALL_PROGRAM	=	$(INSTALL) -p    -m  755
yann@1036: +INSTALL_SCRIPT	=	$(INSTALL) -p    -m  755
yann@1036: +INSTALL_DIR	=	$(INSTALL) -p -d -m  755
yann@1036:  
yann@1036:  OBJ	=	ltrace.o options.o elf.o output.o read_config_file.o	\
yann@1036:  		execute_program.o wait_for_something.o process_event.o	\
yann@1036: diff -durN ltrace-0.5.orig/configure ltrace-0.5/configure
yann@1036: --- ltrace-0.5.orig/configure	2008-11-04 19:23:00.000000000 +0100
yann@1036: +++ ltrace-0.5/configure	2008-11-04 19:23:05.000000000 +0100
yann@1036: @@ -311,7 +311,7 @@
yann@1036:  # include <unistd.h>
yann@1036:  #endif"
yann@1036:  
yann@1036: -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST_OS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP iquote iquoteend LIBOBJS LTLIBOBJS'
yann@1036: +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST_ARCH HOST_OS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP iquote iquoteend LIBOBJS LTLIBOBJS'
yann@1036:  ac_subst_files=''
yann@1036:  
yann@1036:  # Initialize some variables set by options.
yann@1036: @@ -1390,7 +1390,7 @@
yann@1036:  host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
yann@1036:  host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
yann@1036:  
yann@1036: -
yann@1036: +HOST_ARCH="$host_cpu"
yann@1036:  HOST_OS="$host_os"
yann@1036:  case "${HOST_OS}" in
yann@1036:    linux-*) HOST_OS=linux-gnu;;
yann@1036: @@ -4846,6 +4846,7 @@
yann@1036:  s,@host_cpu@,$host_cpu,;t t
yann@1036:  s,@host_vendor@,$host_vendor,;t t
yann@1036:  s,@host_os@,$host_os,;t t
yann@1036: +s,@HOST_ARCH@,$HOST_ARCH,;t t
yann@1036:  s,@HOST_OS@,$HOST_OS,;t t
yann@1036:  s,@CC@,$CC,;t t
yann@1036:  s,@CFLAGS@,$CFLAGS,;t t
yann@1036: diff -durN ltrace-0.5.orig/configure.ac ltrace-0.5/configure.ac
yann@1036: --- ltrace-0.5.orig/configure.ac	2008-11-04 19:23:00.000000000 +0100
yann@1036: +++ ltrace-0.5/configure.ac	2008-11-04 19:23:05.000000000 +0100
yann@1036: @@ -6,10 +6,12 @@
yann@1036:  
yann@1036:  dnl Check host system type
yann@1036:  AC_CANONICAL_HOST
yann@1036: +HOST_ARCH="$host_cpu"
yann@1036:  HOST_OS="$host_os"
yann@1036:  case "${HOST_OS}" in
yann@1036:    linux-*) HOST_OS=linux-gnu;;
yann@1036:  esac
yann@1036: +AC_SUBST(HOST_ARCH)
yann@1036:  AC_SUBST(HOST_OS)
yann@1036:  
yann@1036:  dnl Checks for programs.
yann@1036: diff -durN ltrace-0.5.orig/sysdeps/linux-gnu/Makefile ltrace-0.5/sysdeps/linux-gnu/Makefile
yann@1036: --- ltrace-0.5.orig/sysdeps/linux-gnu/Makefile	2006-02-20 22:44:45.000000000 +0100
yann@1036: +++ ltrace-0.5/sysdeps/linux-gnu/Makefile	2008-11-04 19:23:05.000000000 +0100
yann@1036: @@ -1,6 +1,3 @@
yann@1036: -ARCH		:=	$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
yann@1036: -			-e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/)
yann@1036: -
yann@1036:  CPPFLAGS	+=	-I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH)
yann@1036:  
yann@1036:  OBJ		=	trace.o proc.o breakpoint.o