>>>>> "Michael" == Michael Schmitt <[EMAIL PROTECTED]> writes:
Michael> One reason is that the "find" command does not ensure that
Michael> files are listed alphabetically. Please have a look at the
Michael> attached patch that seems to solve the problem in a very
Michael> simple way.
Michael> The second problem is that many differences look like this
Michael> one:
Michael> -#: ../../1.3.x/src/frontends/xforms/forms/form_bibitem.fd:44
Michael> +#: ../src/frontends/xforms/forms/form_bibitem.fd:44 msgid
Michael> "Key:|#K" msgstr "Schl�ssel:|#S"
Here is a patch that cures that second problem and removes the find.
Can you explain to me what the alphabetic ordering problem is (with
this patch at least)? I do not see it...
There is also in your patch the following change
-.po.pox:
+.po.pox: $(srcdir)/$(PACKAGE).pot
$(MAKE) $(srcdir)/$(PACKAGE).pot
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
that I did not include because I had the feeling that the explicit
call to MAKE below the change has some intent (make sure that the
makefile itself is rebuilt?)
I'll wait for your input before committing it.
JMarc
Index: po/Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.28.2.3
diff -u -p -r1.28.2.3 Makefile.in.in
--- po/Makefile.in.in 19 Nov 2003 16:27:57 -0000 1.28.2.3
+++ po/Makefile.in.in 24 Nov 2003 14:57:41 -0000
@@ -210,6 +210,7 @@ l10n_pots: $(srcdir)/xforms_l10n.pot $(s
msguniq -o $(PACKAGE).po
$(srcdir)/xforms_l10n.pot: $(top_srcdir)/src/frontends/xforms/forms/*.fd
+ cd ${srcdir} ; \
awk ' \
BEGIN { \
print "#, fuzzy"; \
@@ -231,9 +232,10 @@ $(srcdir)/xforms_l10n.pot: $(top_srcdir)
}\
skip=0; \
}' \
- `find $(top_srcdir)/src/frontends/xforms/forms -name \*.fd` > $@
+ ../src/frontends/xforms/forms/*.fd > xforms_l10n.pot
$(srcdir)/qt_l10n.pot: $(top_srcdir)/src/frontends/qt2/ui/*.ui
+ cd ${srcdir} ; \
awk ' \
/<string>/ { \
line=$$0; \
@@ -246,9 +248,10 @@ $(srcdir)/qt_l10n.pot: $(top_srcdir)/src
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n",\
FILENAME, FNR, line); \
}' \
- `find $(top_srcdir)/src/frontends/qt2/ui -name \*.ui` > $@
+ ../src/frontends/qt2/ui/*.ui > qt_l10n.pot
$(srcdir)/layouts_l10n.pot: $(top_srcdir)/lib/layouts/*.layout $(top_srcdir)/lib/layouts/*.inc
+ cd ${srcdir} ; \
awk ' \
/^Style / { \
line=$$0; \
@@ -262,9 +265,10 @@ $(srcdir)/layouts_l10n.pot: $(top_srcdir
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
FILENAME, FNR, line); \
} \
- ' `find $(top_srcdir)/lib/layouts -regex ".*\.\(layout\|inc\)"` > $@
+ ' ../lib/layouts/*.layout ../lib/layouts/*.inc > layouts_l10n.pot
$(srcdir)/languages_l10n.pot: $(top_srcdir)/lib/languages
+ cd ${srcdir} ; \
awk ' \
/^#/ { \
next; \
@@ -275,9 +279,10 @@ $(srcdir)/languages_l10n.pot: $(top_srcd
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
FILENAME, FNR, lang); \
} \
- ' $(top_srcdir)/lib/languages > $@
+ ' ../lib/languages > languages_l10n.pot
$(srcdir)/default_ui_l10n.pot: $(top_srcdir)/lib/ui/default.ui
+ cd ${srcdir} ; \
awk ' \
/^[^#]*Submenu/ { \
line=$$0; \
@@ -293,7 +298,7 @@ $(srcdir)/default_ui_l10n.pot: $(top_src
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
FILENAME, FNR, line); \
} \
- ' $(top_srcdir)/lib/ui/default.ui > $@
+ ' ../lib/ui/default.ui > default_ui_l10n.pot
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
