install-extra.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384
  1. diff -Nur glibc-2.7.orig/elf/Makefile glibc-2.7/elf/Makefile
  2. --- glibc-2.7.orig/elf/Makefile 2007-08-16 23:20:11.000000000 +0200
  3. +++ glibc-2.7/elf/Makefile 2008-09-17 08:57:12.000000000 +0200
  4. @@ -116,7 +116,7 @@
  5. ifeq (yes,$(build-shared))
  6. extra-objs = $(all-rtld-routines:%=%.os) soinit.os sofini.os interp.os
  7. generated += librtld.os dl-allobjs.os ld.so ldd
  8. -install-others = $(inst_slibdir)/$(rtld-installed-name)
  9. +install-extra = $(inst_slibdir)/$(rtld-installed-name)
  10. install-bin-script = ldd
  11. endif
  12. diff -Nur glibc-2.7.orig/iconvdata/Makefile glibc-2.7/iconvdata/Makefile
  13. --- glibc-2.7.orig/iconvdata/Makefile 2007-09-30 06:00:02.000000000 +0200
  14. +++ glibc-2.7/iconvdata/Makefile 2008-09-17 08:56:57.000000000 +0200
  15. @@ -211,7 +211,7 @@
  16. extra-objs += $(modules.so)
  17. -install-others = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
  18. +install-extra = $(addprefix $(inst_gconvdir)/, $(modules.so)) \
  19. $(inst_gconvdir)/gconv-modules
  20. # We can build the conversion tables for numerous charsets automatically.
  21. diff -Nur glibc-2.7.orig/intl/Makefile glibc-2.7/intl/Makefile
  22. --- glibc-2.7.orig/intl/Makefile 2005-05-04 19:53:42.000000000 +0200
  23. +++ glibc-2.7/intl/Makefile 2008-09-17 08:55:58.000000000 +0200
  24. @@ -45,7 +45,7 @@
  25. before-compile = $(objpfx)msgs.h
  26. -install-others = $(inst_msgcatdir)/locale.alias
  27. +install-extra = $(inst_msgcatdir)/locale.alias
  28. generated = msgs.h mtrace-tst-gettext tst-gettext.mtrace
  29. generated-dirs := domaindir localedir
  30. diff -Nur glibc-2.7.orig/localedata/Makefile glibc-2.7/localedata/Makefile
  31. --- glibc-2.7.orig/localedata/Makefile 2007-10-02 19:19:40.000000000 +0200
  32. +++ glibc-2.7/localedata/Makefile 2008-09-17 08:55:35.000000000 +0200
  33. @@ -102,7 +102,7 @@
  34. endif
  35. # Files to install.
  36. -install-others := $(addprefix $(inst_i18ndir)/, \
  37. +install-extra := $(addprefix $(inst_i18ndir)/, \
  38. $(addsuffix .gz, $(charmaps)) \
  39. $(locales))
  40. diff -Nur glibc-2.7.orig/po/Makefile glibc-2.7/po/Makefile
  41. --- glibc-2.7.orig/po/Makefile 2007-05-29 20:08:41.000000000 +0200
  42. +++ glibc-2.7/po/Makefile 2008-09-17 08:55:15.000000000 +0200
  43. @@ -46,7 +46,7 @@
  44. mo-installed = $(inst_msgcatdir)/%/LC_MESSAGES/$(domainname).mo
  45. # Files to install: a $(domainname).mo file for each language.
  46. -install-others = $(LINGUAS:%=$(mo-installed))
  47. +install-extra = $(LINGUAS:%=$(mo-installed))
  48. # Files to distribute: all the source and compiled binary translation files.
  49. distribute = $(ALL_LINGUAS:=.po) $(BROKEN_LINGUAS:=.po) $(ALL_LINGUAS:=.mo) \
  50. diff -Nur glibc-2.7.orig/sunrpc/Makefile glibc-2.7/sunrpc/Makefile
  51. --- glibc-2.7.orig/sunrpc/Makefile 2006-10-18 21:25:38.000000000 +0200
  52. +++ glibc-2.7/sunrpc/Makefile 2008-09-17 08:54:26.000000000 +0200
  53. @@ -52,7 +52,7 @@
  54. svc_auth.h types.h xdr.h auth_des.h \
  55. des_crypt.h key_prot.h rpc_des.h) \
  56. $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
  57. -install-others = $(inst_sysconfdir)/rpc
  58. +install-extra = $(inst_sysconfdir)/rpc
  59. generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
  60. $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
  61. generated-dirs := rpcsvc
  62. diff -Nur glibc-2.7.orig/timezone/Makefile glibc-2.7/timezone/Makefile
  63. --- glibc-2.7.orig/timezone/Makefile 2007-07-28 22:33:11.000000000 +0200
  64. +++ glibc-2.7/timezone/Makefile 2008-09-17 08:54:43.000000000 +0200
  65. @@ -71,7 +71,7 @@
  66. ifeq ($(cross-compiling),no)
  67. # Don't try to install the zoneinfo files since we can't run zic.
  68. -install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
  69. +install-extra = $(addprefix $(inst_zonedir)/,$(zonenames) \
  70. $(zonenames:%=posix/%) \
  71. $(zonenames:%=right/%)) \
  72. $(installed-localtime-file) $(installed-posixrules-file)