From 99fe2b786610ed7b7d5354ed792c22f8446b8ea6 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 24 Feb 2009 02:11:14 +0000 Subject: [PATCH] Add DESTDIR functionality to Makefile.in's. --- winsup/ChangeLog | 4 ++++ winsup/Makefile.in | 4 ++-- winsup/cygserver/ChangeLog | 4 ++++ winsup/cygserver/Makefile.in | 16 ++++++++-------- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/Makefile.in | 24 ++++++++++++------------ winsup/cygwin/spawn.cc | 2 +- winsup/lsaauth/ChangeLog | 4 ++++ winsup/lsaauth/Makefile.in | 8 ++++---- winsup/utils/ChangeLog | 4 ++++ winsup/utils/Makefile.in | 4 ++-- 11 files changed, 49 insertions(+), 29 deletions(-) diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 1ba4bc6d8..90322944f 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,3 +1,7 @@ +2009-02-23 Sjors Gielen + + * Makefile.in: Add DESTDIR functionality. + 2009-01-21 Corinna Vinschen * configure.in: Remove --enable-server option. Allways add the diff --git a/winsup/Makefile.in b/winsup/Makefile.in index a81229e54..3384c2cf8 100644 --- a/winsup/Makefile.in +++ b/winsup/Makefile.in @@ -65,9 +65,9 @@ endif all: Makefile $(SUBDIRS) install-license: CYGWIN_LICENSE COPYING - ${INSTALL} -d $(prefix)/share/doc/Cygwin + ${INSTALL} -d $(DESTDIR)$(prefix)/share/doc/Cygwin for i in $^; do \ - ${INSTALL} $$i $(prefix)/share/doc/Cygwin ; \ + ${INSTALL} $$i $(DESTDIR)$(prefix)/share/doc/Cygwin ; \ done install: Makefile $(INSTALL_LICENSE) $(INSTALL_SUBDIRS) diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index 824f8d26b..e569a69da 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,3 +1,7 @@ +2009-02-23 Sjors Gielen + + * Makefile.in: Add DESTDIR functionality. + 2009-01-21 Corinna Vinschen * client.cc (allow_server): Remove variable. diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in index 8743f6451..6de38aa7d 100644 --- a/winsup/cygserver/Makefile.in +++ b/winsup/cygserver/Makefile.in @@ -51,14 +51,14 @@ CYGWIN_LIB:=$(cygwin_build)/libcygwin.a all: cygserver.exe install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README - $(updir1)/mkinstalldirs $(sbindir) - $(updir1)/mkinstalldirs $(bindir) - $(updir1)/mkinstalldirs $(sysconfdir)/defaults/etc - $(updir1)/mkinstalldirs $(prefix)/share/doc/Cygwin - $(INSTALL_PROGRAM) cygserver.exe $(sbindir)/cygserver.exe - $(INSTALL_PROGRAM) $(srcdir)/cygserver-config $(bindir)/cygserver-config - $(INSTALL_DATA) $(srcdir)/cygserver.conf $(sysconfdir)/defaults/etc/cygserver.conf - $(INSTALL_DATA) $(srcdir)/README $(prefix)/share/doc/Cygwin/cygserver.README + $(updir1)/mkinstalldirs $(DESTDIR)$(sbindir) + $(updir1)/mkinstalldirs $(DESTDIR)$(bindir) + $(updir1)/mkinstalldirs $(DESTDIR)$(sysconfdir)/defaults/etc + $(updir1)/mkinstalldirs $(DESTDIR)$(prefix)/share/doc/Cygwin + $(INSTALL_PROGRAM) cygserver.exe $(DESTDIR)$(sbindir)/cygserver.exe + $(INSTALL_PROGRAM) $(srcdir)/cygserver-config $(DESTDIR)$(bindir)/cygserver-config + $(INSTALL_DATA) $(srcdir)/cygserver.conf $(DESTDIR)$(sysconfdir)/defaults/etc/cygserver.conf + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/share/doc/Cygwin/cygserver.README clean: rm -f $(OBJS) ${patsubst %.o,%.d,$(OBJS)} cygserver.exe diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 377337a4f..1088de8c4 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2009-02-23 Sjors Gielen + + * Makefile.in: Add DESTDIR functionality. + 2009-02-23 Corinna Vinschen * sec_auth.cc (get_user_local_groups): Simplify LookupAccountName code. diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 6fd0882f7..f10cbc624 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -308,37 +308,37 @@ install: install-libs install-headers install-man install_target \ uninstall: uninstall-libs uninstall-headers uninstall-man install-libs: $(TARGET_LIBS) - @$(MKDIRP) $(bindir) - $(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(bindir)/$(DLL_NAME); \ + @$(MKDIRP) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(DESTDIR)$(bindir)/$(DLL_NAME); \ for i in $^; do \ - $(INSTALL_DATA) $$i $(tooldir)/lib/`basename $$i` ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/lib/`basename $$i` ; \ done - cd $(tooldir)/lib && ln -sf libcygwin.a libg.a + cd $(DESTDIR)$(tooldir)/lib && ln -sf libcygwin.a libg.a install-headers: cd $(srcdir); \ for sub in `find include -name '[a-z]*' -type d -print | sort`; do \ - $(MKDIRP) $(tooldir)/$$sub; \ + $(MKDIRP) $(DESTDIR)$(tooldir)/$$sub; \ for i in $$sub/*.h ; do \ - $(INSTALL_DATA) $$i $(tooldir)/$$sub/`basename $$i` ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/$$sub/`basename $$i` ; \ done ; \ done ; \ - $(INSTALL_DATA) regex/regex.h $(tooldir)/include/regex.h + $(INSTALL_DATA) regex/regex.h $(DESTDIR)$(tooldir)/include/regex.h install-man: - @$(MKDIRP) $(mandir)/man2 $(mandir)/man3 $(mandir)/man5 $(mandir)/man7 + @$(MKDIRP) $(DESTDIR)$(mandir)/man2 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 cd $(srcdir); \ for i in `find . -type f -name '*.2'`; do \ - $(INSTALL_DATA) $$i $(mandir)/man2/`basename $$i` ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man2/`basename $$i` ; \ done; \ for i in `find . -type f -name '*.3'`; do \ - $(INSTALL_DATA) $$i $(mandir)/man3/`basename $$i` ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man3/`basename $$i` ; \ done; \ for i in `find . -type f -name '*.5'`; do \ - $(INSTALL_DATA) $$i $(mandir)/man5/`basename $$i` ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man5/`basename $$i` ; \ done; \ for i in `find . -type f -name '*.7'`; do \ - $(INSTALL_DATA) $$i $(mandir)/man7/`basename $$i` ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man7/`basename $$i` ; \ done install_target: diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 121655d49..cd80e1833 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -512,7 +512,7 @@ spawn_guts (const char *prog_arg, const char *const *argv, si.lpReserved2 = (LPBYTE) &ch; si.cbReserved2 = sizeof (ch); - /* Depends on ch.set call above! + /* Depends on ch.set call above. Some file types might need extra effort in the parent after CreateProcess and before copying the datastructures to the child. So we have to start the child in suspend state, unfortunately, to avoid a race condition. */ diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog index 437fcbc8d..6ff5edd1f 100644 --- a/winsup/lsaauth/ChangeLog +++ b/winsup/lsaauth/ChangeLog @@ -1,3 +1,7 @@ +2009-02-23 Sjors Gielen + + * Makefile.in: Add DESTDIR functionality. + 2008-10-12 Christopher Faylor * Makefile.in: Rearrange to avoid -mno-cygwin. diff --git a/winsup/lsaauth/Makefile.in b/winsup/lsaauth/Makefile.in index c4cdccee5..e84a06be1 100644 --- a/winsup/lsaauth/Makefile.in +++ b/winsup/lsaauth/Makefile.in @@ -70,10 +70,10 @@ clean: rm -f *.o *.dll install: all - $(SHELL) $(updir1)/mkinstalldirs $(bindir) - $(INSTALL_PROGRAM) $(DLL) $(bindir)/$(DLL) - $(INSTALL_PROGRAM) $(srcdir)/cyglsa64.dll $(bindir)/cyglsa64.dll - $(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(bindir)/cyglsa-config + $(SHELL) $(updir1)/mkinstalldirs $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(DLL) $(DESTDIR)$(bindir)/$(DLL) + $(INSTALL_PROGRAM) $(srcdir)/cyglsa64.dll $(DESTDIR)$(bindir)/cyglsa64.dll + $(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(DESTDIR)$(bindir)/cyglsa-config %.o: %.c $(CC) $(WIN32_CFLAGS) -c -o $@ $< diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 26a2a13fe..9ebc5f802 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,7 @@ +2009-02-23 Sjors Gielen + + * Makefile.in: Add DESTDIR functionality. + 2009-01-29 Corinna Vinschen * cygcheck.cc (dump_sysinfo): Evaluate and print state of diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index f8041ea74..d4c5309eb 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -158,10 +158,10 @@ realclean: clean rm -f Makefile config.cache install: all - $(SHELL) $(updir1)/mkinstalldirs $(bindir) + $(SHELL) $(updir1)/mkinstalldirs $(DESTDIR)$(bindir) for i in $(CYGWIN_BINS) ${filter-out testsuite.exe,$(MINGW_BINS)} ; do \ n=`echo $$i | sed '$(program_transform_name)'`; \ - $(INSTALL_PROGRAM) $$i $(bindir)/$$n; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$n; \ done $(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile