diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/lib/Makefile.in | 14 |
2 files changed, 5 insertions, 14 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 04a5c5770..8441bc9ea 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2001-12-20 Christopher Faylor <cgf@redhat.com> + + * lib/Makefile.in: Revert inst_installdir definitions to working + versions. + 2001-12-17 Guido Serassio <serassio@libero.it> * include/winsvc.h: Add ChangeServiceConfig2() & diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in index d1a2af3d9..fd1e6b7c9 100644 --- a/winsup/w32api/lib/Makefile.in +++ b/winsup/w32api/lib/Makefile.in @@ -19,7 +19,6 @@ host_alias = @host_alias@ build_alias = @build_alias@ target_alias = @target_alias@ prefix = @prefix@ -config_prefix = @prefix@ includedir:=@includedir@ program_transform_name = @program_transform_name@ @@ -37,23 +36,10 @@ tooldir:=$(exec_prefix)/$(target_alias) endif datadir = @datadir@ infodir = @infodir@ -#FIXME. The inst_includedir and inst_libdir need to be modified to use -#$(tooldir)/usr/include/w32api and $(tooldir)/usr/lib/w32api for the dist -#targets. ifneq (,$(findstring cygwin,$(target_alias))) -ifeq ($(build_alias),$(host_alias)) -ifeq ($(prefix),$(config_prefix)) inst_includedir:=$(tooldir)/include/w32api inst_libdir:=$(tooldir)/lib/w32api else -inst_includedir:=$(tooldir)/include/w32api -inst_libdir:=$(tooldir)/lib/w32api -endif -else -inst_includedir:=$(includedir) -inst_libdir:=$(libdir) -endif -else inst_includedir:=$(includedir) inst_libdir:=$(libdir) endif |