JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* lib/Makefile.in: Install libraries in /usr/lib/w32api when building for

Browse Source 
cygwin.
This commit is contained in:
Christopher Faylor 2001-04-25 03:51:06 +00:00
parent a874cd21de
commit 7260ea4954
2 changed files with 19 additions and 10 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 @@
Tue Apr 24 23:51:07 2001 Christopher Faylor <cgf@cygnus.com>
* lib/Makefile.in: Install libraries in /usr/lib/w32api when building
for cygwin.
Tue Apr 24 16:18:42 2001 Christopher Faylor <cgf@cygnus.com> Tue Apr 24 16:18:42 2001 Christopher Faylor <cgf@cygnus.com>
* include/winsock2.h: Protect one *more* newlib defines when compiling * include/winsock2.h: Protect one *more* newlib defines when compiling

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

@ -19,11 +19,12 @@ host_alias = @host_alias@
build_alias = @build_alias@ build_alias = @build_alias@
target_alias = @target_alias@ target_alias = @target_alias@
prefix = @prefix@ prefix = @prefix@
includedir:=@includedir@
libdir:=@libdir@
program_transform_name = @program_transform_name@ program_transform_name = @program_transform_name@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
libdir = @libdir@
ifeq ($(target_alias),$(host_alias)) ifeq ($(target_alias),$(host_alias))
ifeq ($(build_alias),$(host_alias)) ifeq ($(build_alias),$(host_alias))
tooldir:=$(exec_prefix) tooldir:=$(exec_prefix)
@ -36,9 +37,11 @@ endif
datadir = @datadir@ datadir = @datadir@
infodir = @infodir@ infodir = @infodir@
ifneq (,$(findstring cygwin,$(target_alias))) ifneq (,$(findstring cygwin,$(target_alias)))
includedir = $(tooldir)/include/w32api inst_includedir:=$(tooldir)/include/w32api
inst_libdir:=$(tooldir)/lib/w32api
else else
includedir = @includedir@ inst_includedir:=$(includedir)
inst_libdir:=$(libdir)
endif endif
INSTALL = @INSTALL@ INSTALL = @INSTALL@
@ -142,15 +145,15 @@ lib%.a: %.o
install: install-libraries install-headers install: install-libraries install-headers
install-libraries: all install-libraries: all
$(mkinstalldirs) $(tooldir)/lib $(mkinstalldirs) $(inst_libdir)
for i in $(LIBS); do \ for i in $(LIBS); do \
$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \ $(INSTALL_DATA) $$i $(inst_libdir)/$$i ; \
done done
install-headers: install-headers:
$(mkinstalldirs) $(includedir) $(mkinstalldirs) $(inst_includedir)
for i in $(HEADERS); do \ for i in $(HEADERS); do \
$(INSTALL_DATA) $(srcdir)/../include/$$i $(includedir)/$$i ; \ $(INSTALL_DATA) $(srcdir)/../include/$$i $(inst_includedir)/$$i ; \
done done
# uninstall headers and libraries from a target specified directory # uninstall headers and libraries from a target specified directory
@ -158,14 +161,15 @@ uninstall: uninstall-libraries uninstall-headers
uninstall-libraries: uninstall-libraries:
@for i in $(LIBS); do \ @for i in $(LIBS); do \
rm -f $(tooldir)/lib/$$i ; \ rm -f $(inst_libdir)/$$i ; \
done done
rmdir $(inst_libdir)
uninstall-headers: uninstall-headers:
@for i in $(HEADERS); do \ @for i in $(HEADERS); do \
rm -r $(tooldir)/include/w32api/$$i ; \ rm -r $(inst_includedir)/$$i ; \
done done
rmdir $(tooldir)/include/w32api rmdir $(inst_includedir)
dist: dist: