On Thu, Mar 29, 2001 at 08:54:15PM +1000, Allan Rae wrote:
> To avoid this problem affecting your builds you can change your script
> from:
> make rpmdist
>
> to
> rm -f po/POTFILES*
> make rpmdist
This is what I already do.
> This can't fail because POTFILES can safely be rebuilt at any stage. [...]
Well, I always remove POTFILES (along with all po/*.po files) before
I do a cvs update. The "cvs update" then pulled the bad POTFILES.in
back in.
The build problem is this:
CS file: /usr/local/lyx/cvsroot/lyx-devel/po/POTFILES.in,v
retrieving revision 1.159
diff -u -u -r1.159 POTFILES.in
--- po/POTFILES.in 2001/03/28 09:28:47 1.159
+++ po/POTFILES.in 2001/03/29 16:00:54
@@ -11,7 +11,6 @@
src/exporter.C
src/ext_l10n.h
src/FontLoader.C
-src/form1.C
src/frontends/controllers/ButtonController.h
src/frontends/controllers/ControlCharacter.C
src/frontends/controllers/ControlCopyright.C
@@ -181,7 +180,6 @@
src/layout.C
src/LColor.C
src/LyXAction.C
-src/lyx.C
src/lyx_cb.C
src/lyxfind.C
src/lyxfont.C
> Every update I've done in the last two days (about 8) has had conflicts in
> po/POTFILES.in. This is a very good arguement for removing POTFILES.in
> from CVS because I won't have to keep 'rm -f po/POTFILES*'ing.
That would be fine by me.
> In my testing I haven't needed po/POTFILES.in in a dist to build LyX.
> Someone else should verify this and then we can cull it completely.
>
> Allan. (ARRae)
I have verified that POTFILES.in is not necessary in the CVS. Someone
can go ahead and remove it.
---Kayvan
