1035_all_glibc-install-others.patch

   1 2007-07-24  Mike Frysinger  <vapier@gentoo.org>
   2
   3         * Makefile (+subdir_targets): Add extras with install- prefix.
   4         (install-extras): Change from install-others.
   5         (install-extras-nosubdir): Change from install-others-nosubdir.
   6         * Makerules (install-extras-nosubdir): Define.
   7         (install-no-libc.a-nosubdir): Add install-extras-nosubdir when
   8         build-programs.  Delete install-others-nosubdir when not.
   9         * elf/Makefile (install-extras): Change from install-others.
  10         * iconvdata/Makefile (install-extras): Likewise.
  11         * intl/Makefile (install-extras): Likewise.
  12         * localedata/Makefile (install-extras): Likewise.
  13         * po/Makefile (install-extras): Likewise.
  14         * stdio-common/Makefile (install-extras): Likewise.
  15         * timezone/Makefile (install-extras): Likewise.
  16
  17 --- Makefile
  18 +++ Makefile
  19 @@ -66,7 +66,7 @@
  20                    subdir_echo-headers                                  \
  21                    subdir_install                                       \
  22                    subdir_objs subdir_stubs subdir_testclean            \
  23 -                  $(addprefix install-, no-libc.a bin lib data headers others)
  24 +                  $(addprefix install-, no-libc.a bin lib data headers others extras)
  25  \f
  26  headers := limits.h values.h features.h gnu-versions.h bits/libc-lock.h \
  27            bits/xopen_lim.h gnu/libc-version.h
  28 @@ -78,7 +78,7 @@
  29  vpath %.h $(subdir-dirs)
  30
  31  # What to install.
  32 -install-others = $(inst_includedir)/gnu/stubs.h
  33 +install-extras = $(inst_includedir)/gnu/stubs.h
  34  install-bin-script =
  35
  36  ifeq (yes,$(build-shared))
  37 @@ -167,7 +167,7 @@
  38         $(make-target-directory)
  39         $(INSTALL_DATA) $< $@
  40
  41 -install-others-nosubdir: $(installed-stubs)
  42 +install-extras-nosubdir: $(installed-stubs)
  43  endif
  44
  45
  46 --- Makerules
  47 +++ Makerules
  48 @@ -1144,6 +1144,7 @@
  49  install-data-nosubdir: $(addprefix $(inst_datadir)/,$(install-data))
  50  install-headers-nosubdir: $(addprefix $(inst_includedir)/,$(headers))
  51  install-others-nosubdir: $(install-others)
  52 +install-extras-nosubdir: $(install-extras)
  53
  54  # We need all the `-nosubdir' targets so that `install' in the parent
  55  # doesn't depend on several things which each iterate over the subdirs.
  56 @@ -1155,11 +1156,12 @@
  57  ifeq ($(build-programs),yes)
  58  install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\
  59                             install-bin-nosubdir install-bin-script-nosubdir \
  60 -                           install-lib-nosubdir install-others-nosubdir \
  61 -                           install-rootsbin-nosubdir install-sbin-nosubdir
  62 +                           install-lib-nosubdir install-extras-nosubdir \
  63 +                           install-others-nosubdir install-rootsbin-nosubdir \
  64 +                           install-sbin-nosubdir
  65  else
  66  install-no-libc.a-nosubdir: install-headers-nosubdir install-data-nosubdir\
  67 -                           install-lib-nosubdir install-others-nosubdir
  68 +                           install-lib-nosubdir install-extras-nosubdir
  69  endif
  70  install: install-no-libc.a-nosubdir
  71  \f
  72 --- elf/Makefile
  73 +++ elf/Makefile
  74 @@ -116,7 +116,7 @@
  75  ifeq (yes,$(build-shared))
  76  extra-objs     = $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
  77  generated      += librtld.os dl-allobjs.os ld.so ldd
  78 -install-others = $(inst_slibdir)/$(rtld-installed-name)
  79 +install-extras = $(inst_slibdir)/$(rtld-installed-name)
  80  install-bin-script = ldd
  81  endif
  82
  83 --- iconvdata/Makefile
  84 +++ iconvdata/Makefile
  85 @@ -210,7 +210,7 @@
  86
  87
  88  extra-objs     += $(modules.so)
  89 -install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
  90 +install-extras = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
  91                   $(inst_gconvdir)/gconv-modules
  92
  93  # We can build the conversion tables for numerous charsets automatically.
  94 --- intl/Makefile
  95 +++ intl/Makefile
  96 @@ -45,7 +45,7 @@
  97
  98  before-compile = $(objpfx)msgs.h
  99
 100 -install-others = $(inst_msgcatdir)/locale.alias
 101 +install-extras = $(inst_msgcatdir)/locale.alias
 102
 103  generated = msgs.h mtrace-tst-gettext tst-gettext.mtrace
 104  generated-dirs := domaindir localedir
 105 --- localedata/Makefile
 106 +++ localedata/Makefile
 107 @@ -102,7 +102,7 @@
 108  endif
 109
 110  # Files to install.
 111 -install-others := $(addprefix $(inst_i18ndir)/, \
 112 +install-extras := $(addprefix $(inst_i18ndir)/, \
 113                               $(addsuffix .gz, $(charmaps)) \
 114                               $(locales))
 115
 116 --- po/Makefile
 117 +++ po/Makefile
 118 @@ -46,7 +46,7 @@
 119  mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo
 120
 121  # Files to install: a $(domainname).mo file for each language.
 122 -install-others = $(LINGUAS:%=$(mo-installed))
 123 +install-extras = $(LINGUAS:%=$(mo-installed))
 124
 125  # Files to distribute: all the source and compiled binary translation files.
 126  distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
 127 --- stdio-common/Makefile
 128 +++ stdio-common/Makefile
 129 @@ -36,7 +36,7 @@
 130         remove rename renameat                                                \
 131         flockfile ftrylockfile funlockfile
 132
 133 -install-others = $(inst_includedir)/bits/stdio_lim.h
 134 +install-extras = $(inst_includedir)/bits/stdio_lim.h
 135
 136  include ../Makeconfig
 137
 138 --- timezone/Makefile
 139 +++ timezone/Makefile
 140 @@ -71,14 +71,14 @@
 141
 142  ifeq ($(cross-compiling),no)
 143  # Don't try to install the zoneinfo files since we can't run zic.
 144 -install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
 145 +install-extras = $(addprefix $(inst_zonedir)/,$(zonenames) \
 146                                               $(zonenames:%=posix/%) \
 147                                               $(zonenames:%=right/%)) \
 148                  $(installed-localtime-file) $(installed-posixrules-file)
 149  endif
 150
 151  ifeq ($(have-ksh),yes)
 152 -install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
 153 +install-extras += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
 154  install-bin-script = tzselect
 155  generated += tzselect
 156  endif