This correspond to qt-gui plugin.
Without this patch:
1. `make install DESTDIR=some-dir' prepends DESTDIR to real locale dir
twice. E.g. after
configure --prefix=/usr
make install DESTDIR=/tmp/DESTDIR
directory
/tmp/DESTDIR/tmp/DESTDIR/usr/share/licq/qt-gui/locale
will be created. (Should be `/tmp/DESTDIR/usr/share/licq/qt-gui/locale')
2. symlinks ru.qm and cs.qm created even if files pointed by these links
does not exists.
2002-02-27 Andrew W. Nosenko <[EMAIL PROTECTED]>
* Makefile.am:
(localedir): don't include $(DESTDIR) because am_edit done this in
many cases.
(install-data-local): include $(DESTDIR) in cases that not handled
by am_edit for compensating of $(localedir) changes.
(install-data-local): don't create symlinks if correspond file
does not exists.
(all-local, merge): remove leading space (0x20) characters that
produce "Suspicious line" warning messages under XEmacs
Index: plugins/qt-gui/po/Makefile.am
===================================================================
RCS file: /cvsroot/licq/qt-gui/po/Makefile.am,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile.am
--- plugins/qt-gui/po/Makefile.am 1 Nov 2000 01:16:08 -0000 1.15
+++ plugins/qt-gui/po/Makefile.am 27 Feb 2002 13:25:30 -0000
@@ -3,7 +3,7 @@
#sorry.. another hack for russian people with non-koi8 charset...
#will be removed after qt2.1 releases
-localedir = $(DESTDIR)$(prefix)/share/licq/qt-gui/locale
+localedir = $(prefix)/share/licq/qt-gui/locale
all-local:
@if test -x /usr/bin/test; then \
@@ -15,7 +15,7 @@ all-local:
f=`basename $$i .po`; \
if test ! -r $(top_builddir)/po/$$f.qm || \
$${nt_test} $(srcdir)/$$f.po -nt $(top_builddir)/po/$$f.qm; then \
- if test "$$f" != "template"; then \
+ if test "$$f" != "template"; then \
echo "$(QT_MSG2QM) $(srcdir)/$$f.po $(top_builddir)/po/$$f.qm"; \
$(QT_MSG2QM) $(srcdir)/$$f.po $(top_builddir)/po/$$f.qm; \
fi \
@@ -29,22 +29,22 @@ merge: template
@for i in $(srcdir)/*.po; do \
if test "$$i" != "$(srcdir)/template.po"; then \
echo "Merging $$i"; \
- $(QT_MERGETR) $$i template.po; \
+ $(QT_MERGETR) $$i template.po; \
fi \
done
install-data-local:
- $(mkinstalldirs) $(localedir)
+ $(mkinstalldirs) $(DESTDIR)$(localedir)
@for i in ./*.qm; do \
if test "$$i" != "template.qm"; then \
- echo " $(INSTALL_DATA) $$i $(localedir)/$$i"; \
- $(INSTALL_DATA) $$i $(localedir)/$$i; \
+ echo " $(INSTALL_DATA) $$i $(DESTDIR)$(localedir)/$$i"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(localedir)/$$i; \
fi \
done; \
- cd $(localedir) && rm -f ru.qm; \
- cd $(localedir) && rm -f cs.qm; \
- cd $(localedir) && ln -s ru_RU.KOI8-R.qm ru.qm; \
- cd $(localedir) && ln -s cs_CZ.qm cs.qm
+ cd $(DESTDIR)$(localedir) && rm -f ru.qm; \
+ cd $(DESTDIR)$(localedir) && rm -f cs.qm; \
+ cd $(DESTDIR)$(localedir) && if [ -f ru_RU.KOI8-R.qm ]; then ln -s
+ru_RU.KOI8-R.qm ru.qm; fi; \
+ cd $(DESTDIR)$(localedir) && if [ -f cs_CZ.qm ]; then ln -s cs_CZ.qm cs.qm; fi
template:
cd $(top_srcdir)/src && $(QT_FINDTR) *.cpp *.h > $(top_builddir)/po/template.po
--
Andrew W. Nosenko ([EMAIL PROTECTED])
��������� ������� (c) ����� �������
_______________________________________________
Licq-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/licq-devel
