drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* lib/Makefile.in: Revert inst_installdir definitions to working versions.

This commit is contained in:
Christopher Faylor 2001-12-21 04:42:05 +00:00
parent 4f235c9559
commit 7b5ea138a2
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/w32api/ChangeLog
View File

@ -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> 2001-12-17 Guido Serassio <serassio@libero.it>
* include/winsvc.h: Add ChangeServiceConfig2() & * include/winsvc.h: Add ChangeServiceConfig2() &

14
winsup/w32api/lib/Makefile.in
View File

@ -19,7 +19,6 @@ host_alias = @host_alias@
build_alias = @build_alias@ build_alias = @build_alias@
target_alias = @target_alias@ target_alias = @target_alias@
prefix = @prefix@ prefix = @prefix@
config_prefix = @prefix@
includedir:=@includedir@ includedir:=@includedir@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
@ -37,23 +36,10 @@ tooldir:=$(exec_prefix)/$(target_alias)
endif endif
datadir = @datadir@ datadir = @datadir@
infodir = @infodir@ 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))) ifneq (,$(findstring cygwin,$(target_alias)))
ifeq ($(build_alias),$(host_alias))
ifeq ($(prefix),$(config_prefix))
inst_includedir:=$(tooldir)/include/w32api inst_includedir:=$(tooldir)/include/w32api
inst_libdir:=$(tooldir)/lib/w32api inst_libdir:=$(tooldir)/lib/w32api
else 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_includedir:=$(includedir)
inst_libdir:=$(libdir) inst_libdir:=$(libdir)
endif endif