package/screen/0009-install-dir-dependency.patch

   1 From: Maarten ter Huurne <maarten@treewalker.org>
   2 Date: Mon, 15 Sep 2014 02:27:09 +0200
   3 Subject: Ensure that installation dirs exist before copying files into them
   4
   5 Since the "install_bin" target requires the installation directories
   6 to exist, it should depend on the "installdirs" target. The previous
   7 approach of having "install" depend on "installdirs" is not reliable.
   8
   9 For example, in a parallel build, there was no guarantee that
  10 "installdirs" would be finished before "install_bin" runs. Also if
  11 the user requested only "install_bin" to be made, "installdirs" would
  12 be skipped altogether.
  13
  14 Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
  15 ---
  16  Makefile.in | 4 ++--
  17  1 file changed, 2 insertions(+), 2 deletions(-)
  18
  19 diff --git a/Makefile.in b/Makefile.in
  20 index 860f351..f0fe08d 100644
  21 --- a/Makefile.in
  22 +++ b/Makefile.in
  23 @@ -82,7 +82,7 @@ screen: $(OFILES)
  24         $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
  25             $(OPTIONS) $(CFLAGS) $<
  26
  27 -install_bin: .version screen
  28 +install_bin: .version screen installdirs
  29         $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
  30         -chown root $(DESTDIR)$(bindir)/$(SCREEN)
  31         -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
  32 @@ -94,7 +94,7 @@ endif
  33         cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
  34
  35  ###############################################################################
  36 -install: installdirs install_bin
  37 +install: install_bin
  38         cd doc ; $(MAKE) install
  39         -if [ -d /usr/lib/terminfo ]; then \
  40                 PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
  41 --
  42 1.8.4.5
  43