From 99fe2b786610ed7b7d5354ed792c22f8446b8ea6 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Tue, 24 Feb 2009 02:11:14 +0000
Subject: Add DESTDIR functionality to Makefile.in's.

---
 winsup/cygwin/ChangeLog   |  4 ++++
 winsup/cygwin/Makefile.in | 24 ++++++++++++------------
 winsup/cygwin/spawn.cc    |  2 +-
 3 files changed, 17 insertions(+), 13 deletions(-)

(limited to 'winsup/cygwin')

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 <mailinglist@dazjorz.com>
+
+	* Makefile.in: Add DESTDIR functionality.
+
 2009-02-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* 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. */
-- 
cgit v1.2.3