diff options
author | Christopher Faylor <me@cgf.cx> | 2008-11-26 19:40:29 +0300 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2008-11-26 19:40:29 +0300 |
commit | 81fa789153c89a611c7fb3670bff95feb789c437 (patch) | |
tree | e5641e299b412c8cc3975211dc58c9a9a84bdffa | |
parent | d8655020634cad32686b9d21d54c1db6f706e6ca (diff) |
* Makefile.in: Revert erroneous checkin.
* Makefile.common: Tweak to work better with new utils/mingw front-end.
-rw-r--r-- | winsup/ChangeLog | 5 | ||||
-rw-r--r-- | winsup/Makefile.in | 19 |
2 files changed, 14 insertions, 10 deletions
diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 035cf4c1d..d1505a099 100644 --- 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 90f9e9ac2..4417a9585 100644 --- 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@ |