* Makefile.in: Revert erroneous checkin.

* Makefile.common: Tweak to work better with new utils/mingw front-end.

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 035cf4c1d09d36ff829753807554b76ce0744246..d1505a09978071c92b5ee86737bb2275b4136208 100644 (file)
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-12  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * Makefile.in: Revert erroneous checkin.
+       * Makefile.common: Tweak to work better with new utils/mingw front-end.
+
 2008-10-11  Christopher Faylor  <me+cygwin@cgf.cx>
 
        * Makefile.in: Tweak to work better with new utils/mingw front-end.

diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index 90f9e9ac2b45ad5b1e8f121050396a9d0cdcf353..4417a9585c6597850473aade9681c7acfe08fda4 100644 (file)
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile.in for windows stuff
-# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007
+# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
 # Red Hat, Inc.
 #
 # This file is part of Cygwin.
@@ -15,19 +15,15 @@ VPATH:=@srcdir@
 srcdir:=@srcdir@
 objdir:=.
 
-DESTDIR=
 target_alias:=@target_alias@
 build_alias:=@build_alias@
 host_alias:=@host_alias@
-prefix:=${DESTDIR}@prefix@
-exec_prefix:=${DESTDIR}@exec_prefix@
-bindir:=${DESTDIR}@bindir@
-libdir:=${DESTDIR}@libdir@
-datadir:=${DESTDIR}@datadir@
-infodir:=${DESTDIR}@infodir@
-includedir:=${DESTDIR}@includedir@
-program_transform_name:=@program_transform_name@
+prefix:=@prefix@
 
+program_transform_name:=@program_transform_name@
+exec_prefix:=@exec_prefix@
+bindir:=@bindir@
+libdir:=@libdir@
 ifeq ($(target_alias),$(host_alias))
 ifeq ($(build_alias),$(host_alias))
 tooldir:=$(exec_prefix)
@@ -37,6 +33,9 @@ endif
 else
 tooldir:=$(exec_prefix)/$(target_alias)
 endif
+datadir:=@datadir@
+infodir:=@infodir@
+includedir:=@includedir@
 
 INSTALL:=@INSTALL@
 INSTALL_PROGRAM:=@INSTALL_PROGRAM@