Add DESTDIR functionality to Makefile.in's.

diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 1ba4bc6d8c6a63bba8e93cdaa23d7686e1d7ecb4..90322944f5b658d5653ab1dffc8355b5d3882eee 100644 (file)
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-23  Sjors Gielen <mailinglist@dazjorz.com>
+
+       * Makefile.in: Add DESTDIR functionality.
+
 2009-01-21  Corinna Vinschen  <corinna@vinschen.de>
 
        * configure.in: Remove --enable-server option.  Allways add the

diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index a81229e546881574793bc675381e5ae69062c88a..3384c2cf8d8c5ae4db8235a08cbe5c47c1a7536a 100644 (file)
--- 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 824f8d26b58117f59b3d5d2adaba187439e3ac89..e569a69da29c90330bad9d74f2c8108c81a98337 100644 (file)
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-23  Sjors Gielen <mailinglist@dazjorz.com>
+
+       * Makefile.in: Add DESTDIR functionality.
+
 2009-01-21  Corinna Vinschen  <corinna@vinschen.de>
 
        * client.cc (allow_server): Remove variable.

diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index 8743f645187e6e7a6a819327ee0e7256d9bce2d5..6de38aa7dec0848c55411c2a120f7027cca8ec5f 100644 (file)
--- 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 377337a4f9c3f756f56d12378a5e74e42f9d914f..1088de8c418dd58c154e4309abc851d91c954470 100644 (file)
--- 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 6fd0882f70f280b34b40c1fd383acca1e3db1e85..f10cbc62468b3ea214513ad960d1a716cfc590e9 100644 (file)
--- 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 121655d490c94d672ca40319d80aed016a22a3d9..cd80e1833dd52774fe41cf2925f36f047c4670a4 100644 (file)
--- 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 437fcbc8d4081fdc2a439190b6eb278eb67b9071..6ff5edd1f2ffef5a50308073a4f1f8dfc2913c74 100644 (file)
--- a/winsup/lsaauth/ChangeLog
+++ b/winsup/lsaauth/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-23  Sjors Gielen <mailinglist@dazjorz.com>
+
+       * Makefile.in: Add DESTDIR functionality.
+
 2008-10-12  Christopher Faylor  <me+cygwin@cgf.cx>
 
        * Makefile.in: Rearrange to avoid -mno-cygwin.

diff --git a/winsup/lsaauth/Makefile.in b/winsup/lsaauth/Makefile.in
index c4cdccee503bce88883c2a5471508380862ac9bc..e84a06be14cbdc469356dbed20419cd135d11476 100644 (file)
--- 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 26a2a13fe27bdd034d620fc67889bfde7d85a84c..9ebc5f8022ce7a23b6206ee2afab866c285020f4 100644 (file)
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-23  Sjors Gielen <mailinglist@dazjorz.com>
+
+       * Makefile.in: Add DESTDIR functionality.
+
 2009-01-29  Corinna Vinschen  <corinna@vinschen.de>
 
        * cygcheck.cc (dump_sysinfo): Evaluate and print state of

diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index f8041ea7421dc0ee4c4d1f6c0a67445f0bb71b68..d4c5309eb6e1980d04f2d1f42ac17107c1bd263f 100644 (file)
--- 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