diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog index 15ac5f956..87723a278 100644 --- a/winsup/testsuite/ChangeLog +++ b/winsup/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-11-26 Christopher Faylor + + * Revert erroneous checkin. + 2006-07-23 Christopher Faylor * Makefile.in: Update copyright. Remove unused stuff. diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in index da7c56094..d7d151501 100644 --- a/winsup/testsuite/Makefile.in +++ b/winsup/testsuite/Makefile.in @@ -19,12 +19,14 @@ VPATH:=$(srcdir):$(libltp_srcdir)/lib target_alias:=@target_alias@ build_alias:=@build_alias@ host_alias:=@host_alias@ -prefix:=@prefix@ + +DESTDIR= +prefix:=${DESTDIR}@prefix@ program_transform_name:=@program_transform_name@ -exec_prefix:=@exec_prefix@ -bindir:=@bindir@ -libdir:=@libdir@ +exec_prefix:=${DESTDIR}@exec_prefix@ +bindir:=${DESTDIR}@bindir@ +libdir:=${DESTDIR}@libdir@ ifeq ($(target_alias),$(host_alias)) ifeq ($(build_alias),$(host_alias)) tooldir:=$(exec_prefix) @@ -34,9 +36,9 @@ endif else tooldir:=$(exec_prefix)/$(target_alias) endif -datadir:=@datadir@ -infodir:=@infodir@ -includedir:=@includedir@ +datadir:=${DESTDIR}@datadir@ +infodir:=${DESTDIR}@infodir@ +includedir:=${DESTDIR}@includedir@ TESTSUP_INCLUDES:=-I$(libltp_srcdir)/include