diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-10-08 11:22:35 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-10-08 11:22:35 +0000 |
| commit | e48fbe89583ae8f5a172e26757d622fc3742f2f1 (patch) | |
| tree | 9de43702111afaf64f4b49b589fdac6126ef1e6b /rules/gettext.make | |
| parent | e38134d5cf692ea2812007010c0d7d83b3791c25 (diff) | |
| download | ptxdist-e48fbe89583ae8f5a172e26757d622fc3742f2f1.tar.gz ptxdist-e48fbe89583ae8f5a172e26757d622fc3742f2f1.tar.xz | |
fixed stuff all over the place; make ipkg install work. Patch by Kai-Uwe Bloem
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@3204 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/gettext.make')
| -rw-r--r-- | rules/gettext.make | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/rules/gettext.make b/rules/gettext.make index e2131b32d..0f26dad6c 100644 --- a/rules/gettext.make +++ b/rules/gettext.make @@ -27,6 +27,8 @@ GETTEXT_URL = $(PTXCONF_SETUP_GNUMIRROR)/gettext/$(GETTEXT).$(GETTEXT_SUFFIX) GETTEXT_SOURCE = $(SRCDIR)/$(GETTEXT).$(GETTEXT_SUFFIX) GETTEXT_DIR = $(BUILDDIR)/$(GETTEXT) +GETTEXT_INST_DIR = $(BUILDDIR)/$(GETTEXT)-install + # ---------------------------------------------------------------------------- # Get # ---------------------------------------------------------------------------- @@ -72,7 +74,9 @@ gettext_prepare_deps = \ $(STATEDIR)/virtual-xchain.install GETTEXT_PATH = PATH=$(CROSS_PATH) -GETTEXT_ENV = $(CROSS_ENV) +GETTEXT_ENV = $(CROSS_ENV) \ + ac_cv_func_getline=yes \ + am_cv_func_working_getline=yes # # autoconf @@ -81,8 +85,8 @@ GETTEXT_ENV = $(CROSS_ENV) GETTEXT_AUTOCONF = $(CROSS_AUTOCONF) GETTEXT_AUTOCONF += --prefix=/usr -# This is braindead but correct :-) -GETTEXT_AUTOCONF += --disable-nls +# This is braindead but correct :-) No, it isn't! +# GETTEXT_AUTOCONF += --disable-nls $(STATEDIR)/gettext.prepare: $(gettext_prepare_deps) @$(call targetinfo, $@) @@ -110,15 +114,17 @@ $(STATEDIR)/gettext.compile: $(gettext_compile_deps) gettext_install: $(STATEDIR)/gettext.install -$(STATEDIR)/gettext.install: $(STATEDIR)/gettext.compile +gettext_install_deps = $(STATEDIR)/gettext.compile + +$(STATEDIR)/gettext.install: $(gettext_install_deps) @$(call targetinfo, $@) - install -d $(PTXCONF_PREFIX)/lib - rm -f $(PTXCONF_PREFIX)/lib/libgnuintl.so* - install $(GETTEXT_DIR)/gettext-runtime/intl/.libs/libgnuintl.so* $(PTXCONF_PREFIX)/lib/ -# ln -s $(PTXCONF_PREFIX)/lib/libgnuintl.so* $(PTXCONF_PREFIX)/lib/libgnuintl.so.2 -# ln -s $(PTXCONF_PREFIX)/lib/libgnuintl.so.2 $(PTXCONF_PREFIX)/lib/libgnuintl.so - install $(GETTEXT_DIR)/gettext-runtime/intl/libgnuintl.h $(PTXCONF_PREFIX)/include - install $(GETTEXT_DIR)/gettext-tools/src/msgfmt $(PTXCONF_PREFIX)/bin + rm -rf $(GETTEXT_INST_DIR) + cd $(GETTEXT_DIR) && $(GETTEXT_PATH) make install prefix=$(GETTEXT_INST_DIR)/usr + mkdir -p $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib + cp -a $(GETTEXT_INST_DIR)/usr/lib/. $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib + mkdir -p $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include + cp -a $(GETTEXT_INST_DIR)/usr/include/. $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include + rm -rf $(GETTEXT_INST_DIR) $(call touch, $@) # ---------------------------------------------------------------------------- @@ -127,7 +133,7 @@ $(STATEDIR)/gettext.install: $(STATEDIR)/gettext.compile gettext_targetinstall: $(STATEDIR)/gettext.targetinstall -gettext_targetinstall_deps = $(STATEDIR)/gettext.compile +gettext_targetinstall_deps = $(STATEDIR)/gettext.install $(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps) @$(call targetinfo, $@) @@ -141,10 +147,14 @@ $(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps) @$(call install_fixup,DEPENDS,) @$(call install_fixup,DESCRIPTION,missing) - # FIXME: RSC: do wildcards work? - @$(call install_copy, 0, 0, 0644, $(GETTEXT_DIR)/gettext-runtime/intl/.libs/libgnuintl.so.*, /usr/lib/) - @$(call install_link, libgnuintl.so.*, /lib/libgnuintl.so.2) - @$(call install_link, libgnuintl.so.*, /lib/libgnuintl.so) + cd $(GETTEXT_DIR)/gettext-runtime/intl/.libs && \ + for file in `find . -type f -name 'lib*intl.so*'`; do \ + $(call install_copy, 0, 0, 0644, $$file, /usr/lib/$$file, n) \ + done + cd $(GETTEXT_DIR)/gettext-runtime/intl/.libs && \ + for file in `find . -type l -name 'lib*intl.so*'`; do \ + $(call install_link, `readlink $$file`, /usr/lib/$$file) \ + done @$(call install_finish) |