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

* lib/Makefile.in (dist, install): Correct the install destinations. 

* lib/ddk/Makefile.in (dist, install): Ditto.
This commit is contained in:
Earnie Boyd 2002-11-25 18:14:25 +00:00
parent d1b6d5cd14
commit 60d4d42f4f
3 changed files with 25 additions and 13 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 @@
2002-11-25 Earnie Boyd <earnie@users.sf.net>
* lib/Makefile.in (dist, install): Correct the install destinations.
* lib/ddk/Makefile.in (dist, install): Ditto.
2002-11-16 Danny Smith <dannysmith@users.sourceforge.net> 2002-11-16 Danny Smith <dannysmith@users.sourceforge.net>
* lib/uuid.c (CATID_InternetAware,CLSID_HttpSProtocol, * lib/uuid.c (CATID_InternetAware,CLSID_HttpSProtocol,

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

@ -172,7 +172,7 @@ lib%.a: %.o
$(AR) rc $@ $*.o $(AR) rc $@ $*.o
$(RANLIB) $@ $(RANLIB) $@
.PHONY: install install-libraries install-headers install-pdk .PHONY: install install-libraries install-headers install-ddk
# install headers and libraries in a target specified directory. # install headers and libraries in a target specified directory.
install: install-libraries install-headers install-ddk install: install-libraries install-headers install-ddk
@ -193,10 +193,10 @@ install-headers:
done done
install-ddk: install-libraries install-headers install-ddk: install-libraries install-headers
(cd ddk; $(MAKE) install) (cd ddk && $(MAKE) install $(FLAGS_TO_PASS) prefix=../$(prefix) exec_prefix=../$(exec_prefix))
# uninstall headers and libraries from a target specified directory # uninstall headers and libraries from a target specified directory
uninstall: uninstall-pdk uninstall-libraries uninstall-headers uninstall: uninstall-ddk uninstall-libraries uninstall-headers
uninstall-libraries: uninstall-libraries:
@for i in $(LIBS); do \ @for i in $(LIBS); do \
@ -210,8 +210,8 @@ uninstall-headers:
done done
rmdir $(inst_includedir) rmdir $(inst_includedir)
uninstall-pdk: uninstall-ddk:
cd ddk && $(MAKE) -C uninstall cd ddk && $(MAKE) -C uninstall $(FLAGS_TO_PASS)
dist: dist:
mkdir $(distdir)/include mkdir $(distdir)/include
@ -219,11 +219,18 @@ dist:
@for i in $(HEADERS); do \ @for i in $(HEADERS); do \
cp -p $(srcdir)/../include/$$i $(distdir)/include/$$i ; \ cp -p $(srcdir)/../include/$$i $(distdir)/include/$$i ; \
done done
mkdir $(distdir)/include/GL
@for i in $(GL_HEADERS); do \
cp -p $(srcdir)/../include/GL/$$i $(distdir)/include/GL/$$i ; \
done
mkdir $(distdir)/lib mkdir $(distdir)/lib
chmod 755 $(distdir)/lib chmod 755 $(distdir)/lib
@for i in $(DISTFILES); do \ @for i in $(DISTFILES); do \
cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \ cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \
done done
for i in $(SUBDIRS); do \
(cd $$i; $(MAKE) distdir=../$(distdir) dist); \
done
Makefile: Makefile.in ../config.status ../configure Makefile: Makefile.in ../config.status ../configure
cd ..; $(SHELL) config.status cd ..; $(SHELL) config.status

16
winsup/w32api/lib/ddk/Makefile.in
View File

@ -36,8 +36,8 @@ endif
datadir = @datadir@ datadir = @datadir@
infodir = @infodir@ infodir = @infodir@
ifneq (,$(findstring cygwin,$(target_alias))) ifneq (,$(findstring cygwin,$(target_alias)))
inst_includedir:=$(tooldir)/include/ddk inst_includedir:=$(tooldir)/include/w32api/ddk
inst_libdir:=$(tooldir)/lib inst_libdir:=$(tooldir)/lib/w32api
else else
inst_includedir:=$(includedir)/ddk inst_includedir:=$(includedir)/ddk
inst_libdir:=$(libdir) inst_libdir:=$(libdir)
@ -167,15 +167,15 @@ uninstall-headers:
dist: dist:
mkdir $(distdir)/include mkdir $(distdir)/include/ddk
chmod 755 $(distdir)/include chmod 755 $(distdir)/include/ddk
@for i in $(HEADERS); do \ @for i in $(HEADERS); do \
cp -p $(srcdir)/../../ddk/include/$$i $(distdir)/include/ddk/$$i ; \ cp -p $(srcdir)/../../include/ddk/$$i $(distdir)/include/ddk/$$i ; \
done done
mkdir $(distdir)/lib mkdir $(distdir)/lib/ddk
chmod 755 $(distdir)/lib chmod 755 $(distdir)/lib/ddk
@for i in $(DISTFILES); do \ @for i in $(DISTFILES); do \
cp -p $(srcdir)/$$i $(distdir)/lib/$$i ; \ cp -p $(srcdir)/$$i $(distdir)/lib/ddk/$$i ; \
done done
Makefile: Makefile.in ../../config.status ../../configure Makefile: Makefile.in ../../config.status ../../configure