Add DESTDIR functionality to Makefile.in's.

This commit is contained in:
Christopher Faylor 2009-02-24 02:11:14 +00:00
parent be6f5dfdc7
commit 99fe2b7866
11 changed files with 49 additions and 29 deletions

View File

@ -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> 2009-01-21 Corinna Vinschen <corinna@vinschen.de>
* configure.in: Remove --enable-server option. Allways add the * configure.in: Remove --enable-server option. Allways add the

View File

@ -65,9 +65,9 @@ endif
all: Makefile $(SUBDIRS) all: Makefile $(SUBDIRS)
install-license: CYGWIN_LICENSE COPYING install-license: CYGWIN_LICENSE COPYING
${INSTALL} -d $(prefix)/share/doc/Cygwin ${INSTALL} -d $(DESTDIR)$(prefix)/share/doc/Cygwin
for i in $^; do \ for i in $^; do \
${INSTALL} $$i $(prefix)/share/doc/Cygwin ; \ ${INSTALL} $$i $(DESTDIR)$(prefix)/share/doc/Cygwin ; \
done done
install: Makefile $(INSTALL_LICENSE) $(INSTALL_SUBDIRS) install: Makefile $(INSTALL_LICENSE) $(INSTALL_SUBDIRS)

View File

@ -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> 2009-01-21 Corinna Vinschen <corinna@vinschen.de>
* client.cc (allow_server): Remove variable. * client.cc (allow_server): Remove variable.

View File

@ -51,14 +51,14 @@ CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
all: cygserver.exe all: cygserver.exe
install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README
$(updir1)/mkinstalldirs $(sbindir) $(updir1)/mkinstalldirs $(DESTDIR)$(sbindir)
$(updir1)/mkinstalldirs $(bindir) $(updir1)/mkinstalldirs $(DESTDIR)$(bindir)
$(updir1)/mkinstalldirs $(sysconfdir)/defaults/etc $(updir1)/mkinstalldirs $(DESTDIR)$(sysconfdir)/defaults/etc
$(updir1)/mkinstalldirs $(prefix)/share/doc/Cygwin $(updir1)/mkinstalldirs $(DESTDIR)$(prefix)/share/doc/Cygwin
$(INSTALL_PROGRAM) cygserver.exe $(sbindir)/cygserver.exe $(INSTALL_PROGRAM) cygserver.exe $(DESTDIR)$(sbindir)/cygserver.exe
$(INSTALL_PROGRAM) $(srcdir)/cygserver-config $(bindir)/cygserver-config $(INSTALL_PROGRAM) $(srcdir)/cygserver-config $(DESTDIR)$(bindir)/cygserver-config
$(INSTALL_DATA) $(srcdir)/cygserver.conf $(sysconfdir)/defaults/etc/cygserver.conf $(INSTALL_DATA) $(srcdir)/cygserver.conf $(DESTDIR)$(sysconfdir)/defaults/etc/cygserver.conf
$(INSTALL_DATA) $(srcdir)/README $(prefix)/share/doc/Cygwin/cygserver.README $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/share/doc/Cygwin/cygserver.README
clean: clean:
rm -f $(OBJS) ${patsubst %.o,%.d,$(OBJS)} cygserver.exe rm -f $(OBJS) ${patsubst %.o,%.d,$(OBJS)} cygserver.exe

View File

@ -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> 2009-02-23 Corinna Vinschen <corinna@vinschen.de>
* sec_auth.cc (get_user_local_groups): Simplify LookupAccountName code. * sec_auth.cc (get_user_local_groups): Simplify LookupAccountName code.

View File

@ -308,37 +308,37 @@ install: install-libs install-headers install-man install_target \
uninstall: uninstall-libs uninstall-headers uninstall-man uninstall: uninstall-libs uninstall-headers uninstall-man
install-libs: $(TARGET_LIBS) install-libs: $(TARGET_LIBS)
@$(MKDIRP) $(bindir) @$(MKDIRP) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(bindir)/$(DLL_NAME); \ $(INSTALL_PROGRAM) $(TEST_DLL_NAME) $(DESTDIR)$(bindir)/$(DLL_NAME); \
for i in $^; do \ for i in $^; do \
$(INSTALL_DATA) $$i $(tooldir)/lib/`basename $$i` ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/lib/`basename $$i` ; \
done done
cd $(tooldir)/lib && ln -sf libcygwin.a libg.a cd $(DESTDIR)$(tooldir)/lib && ln -sf libcygwin.a libg.a
install-headers: install-headers:
cd $(srcdir); \ cd $(srcdir); \
for sub in `find include -name '[a-z]*' -type d -print | sort`; do \ 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 \ for i in $$sub/*.h ; do \
$(INSTALL_DATA) $$i $(tooldir)/$$sub/`basename $$i` ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/$$sub/`basename $$i` ; \
done ; \ done ; \
done ; \ done ; \
$(INSTALL_DATA) regex/regex.h $(tooldir)/include/regex.h $(INSTALL_DATA) regex/regex.h $(DESTDIR)$(tooldir)/include/regex.h
install-man: 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); \ cd $(srcdir); \
for i in `find . -type f -name '*.2'`; do \ 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; \ done; \
for i in `find . -type f -name '*.3'`; do \ 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; \ done; \
for i in `find . -type f -name '*.5'`; do \ 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; \ done; \
for i in `find . -type f -name '*.7'`; do \ 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 done
install_target: install_target:

View File

@ -512,7 +512,7 @@ spawn_guts (const char *prog_arg, const char *const *argv,
si.lpReserved2 = (LPBYTE) &ch; si.lpReserved2 = (LPBYTE) &ch;
si.cbReserved2 = sizeof (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 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 and before copying the datastructures to the child. So we have to start
the child in suspend state, unfortunately, to avoid a race condition. */ the child in suspend state, unfortunately, to avoid a race condition. */

View File

@ -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> 2008-10-12 Christopher Faylor <me+cygwin@cgf.cx>
* Makefile.in: Rearrange to avoid -mno-cygwin. * Makefile.in: Rearrange to avoid -mno-cygwin.

View File

@ -70,10 +70,10 @@ clean:
rm -f *.o *.dll rm -f *.o *.dll
install: all install: all
$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(SHELL) $(updir1)/mkinstalldirs $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) $(DLL) $(bindir)/$(DLL) $(INSTALL_PROGRAM) $(DLL) $(DESTDIR)$(bindir)/$(DLL)
$(INSTALL_PROGRAM) $(srcdir)/cyglsa64.dll $(bindir)/cyglsa64.dll $(INSTALL_PROGRAM) $(srcdir)/cyglsa64.dll $(DESTDIR)$(bindir)/cyglsa64.dll
$(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(bindir)/cyglsa-config $(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(DESTDIR)$(bindir)/cyglsa-config
%.o: %.c %.o: %.c
$(CC) $(WIN32_CFLAGS) -c -o $@ $< $(CC) $(WIN32_CFLAGS) -c -o $@ $<

View File

@ -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> 2009-01-29 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (dump_sysinfo): Evaluate and print state of * cygcheck.cc (dump_sysinfo): Evaluate and print state of

View File

@ -158,10 +158,10 @@ realclean: clean
rm -f Makefile config.cache rm -f Makefile config.cache
install: all install: all
$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(SHELL) $(updir1)/mkinstalldirs $(DESTDIR)$(bindir)
for i in $(CYGWIN_BINS) ${filter-out testsuite.exe,$(MINGW_BINS)} ; do \ for i in $(CYGWIN_BINS) ${filter-out testsuite.exe,$(MINGW_BINS)} ; do \
n=`echo $$i | sed '$(program_transform_name)'`; \ n=`echo $$i | sed '$(program_transform_name)'`; \
$(INSTALL_PROGRAM) $$i $(bindir)/$$n; \ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$n; \
done done
$(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile $(cygwin_build)/libcygwin.a: $(cygwin_build)/Makefile