diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-11 19:10:47 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-04-12 15:30:41 +0200 |
| commit | 461bfe379e008d0b2d8ef18487a45d9dd2d7fa3f (patch) | |
| tree | fbbfc6d05f3b25901e64a4ab18795b8046bef1c0 /rules/locales.make | |
| parent | d72212ea9cbf552d7da47d72412693f7e13da3ea (diff) | |
| download | ptxdist-461bfe379e008d0b2d8ef18487a45d9dd2d7fa3f.tar.gz ptxdist-461bfe379e008d0b2d8ef18487a45d9dd2d7fa3f.tar.xz | |
[locales] install locales to LOCALES_PKGDIR and not LOCALES_DIR
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/locales.make')
| -rw-r--r-- | rules/locales.make | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/rules/locales.make b/rules/locales.make index b07e7c173..00e6a1dab 100644 --- a/rules/locales.make +++ b/rules/locales.make @@ -18,7 +18,6 @@ PACKAGES-$(PTXCONF_LOCALES) += locales # LOCALES := locales LOCALES_VERSION := 1.0 -LOCALES_DIR := $(BUILDDIR)/$(LOCALES) # ---------------------------------------------------------------------------- # Get @@ -55,35 +54,35 @@ $(STATEDIR)/locales.compile: $(STATEDIR)/locales.install: @$(call targetinfo) - @$(call clean, $(LOCALES_DIR)) - @mkdir -p $(LOCALES_DIR)/usr/lib/locale + @$(call clean, $(LOCALES_PKGDIR)) + @mkdir -p $(LOCALES_PKGDIR)/usr/lib/locale ifdef PTXCONF_LOCALES_EN_US - @$(call add_locale, en_US, en_US, ISO-8859-1, $(LOCALES_DIR)) + @$(call add_locale, en_US, en_US, ISO-8859-1, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_EN_GB - @$(call add_locale, en_GB, en_GB, ISO-8859-1, $(LOCALES_DIR)) + @$(call add_locale, en_GB, en_GB, ISO-8859-1, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_DE_DE - @$(call add_locale, de_DE, de_DE, ISO-8859-1, $(LOCALES_DIR)) + @$(call add_locale, de_DE, de_DE, ISO-8859-1, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_DE_DE_EURO - @$(call add_locale, de_DE@euro, de_DE@euro, ISO-8859-15, $(LOCALES_DIR)) + @$(call add_locale, de_DE@euro, de_DE@euro, ISO-8859-15, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_ZH_CN - @$(call add_locale, zh_CN, zh_CN, GB2312, $(LOCALES_DIR)) + @$(call add_locale, zh_CN, zh_CN, GB2312, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_ZH_CN_GBK - @$(call add_locale, zh_CN.GBK, zh_CN, GBK, $(LOCALES_DIR)) + @$(call add_locale, zh_CN.GBK, zh_CN, GBK, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_ZH_CN_GB18030 - @$(call add_locale, zh_CN.GB18030, zh_CN, GB18030, $(LOCALES_DIR)) + @$(call add_locale, zh_CN.GB18030, zh_CN, GB18030, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_ZH_TW - @$(call add_locale, zh_TW, zh_TW, BIG5, $(LOCALES_DIR)) + @$(call add_locale, zh_TW, zh_TW, BIG5, $(LOCALES_PKGDIR)) endif ifdef PTXCONF_LOCALES_ZH_HK - @$(call add_locale, zh_HK, zh_HK, BIG5-HKSCS, $(LOCALES_DIR)) + @$(call add_locale, zh_HK, zh_HK, BIG5-HKSCS, $(LOCALES_PKGDIR)) endif @$(call touch) @@ -104,8 +103,9 @@ $(STATEDIR)/locales.targetinstall: @$(call install_fixup, locales,DEPENDS,) @$(call install_fixup, locales,DESCRIPTION,missing) - @$(call install_copy, locales, 0, 0, 0755, $(LOCALES_DIR)/usr/lib/locale/locale-archive, \ - /usr/lib/locale/locale-archive, n); + @$(call install_copy, locales, 0, 0, 0755, -, \ + /usr/lib/locale/locale-archive, n) + @$(call install_finish, locales) @$(call touch) |