Apparently a distributed LyX will compile perfectly under non GNU-Make,
apart from the optimisation in po/Makefile.in.in, using := instead of
=
This small patch changes it to calculate the list of Makefile.am files
at configure time. This better reflects the place where Makefile.am
additions/removals are made, and apparently will allow a non GNU-Make
build (I haven't tested this, but am going on comments from the mailing
list).
Comments ?
thanks
john
--
"Be conservative in what you do, be liberal in what you accept from others."
- Jon Postel
? pot.diff
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.725
diff -u -p -r1.725 ChangeLog
--- ChangeLog 2000/12/13 13:30:35 1.725
+++ ChangeLog 2000/12/13 19:23:42
@@ -1,3 +1,9 @@
+2000-12-12 John Levon <[EMAIL PROTECTED]>
+
+ * configure.in:
+ * po/Makefile.in.in: generate the list of Makefile.am files
+ at configure time, to avoid needing GNU Make to build LyX
+
2000-12-11 John Levon <[EMAIL PROTECTED]>
* README: add mention of broken ghostscript versions, remove
Index: configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.in,v
retrieving revision 1.57
diff -u -p -r1.57 configure.in
--- configure.in 2000/12/04 17:17:57 1.57
+++ configure.in 2000/12/13 19:23:42
@@ -214,6 +214,10 @@ AM_GNU_GETTEXT
case "${XGETTEXT}" in
*:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
esac
+# it is better to calculate this list here, than have to use := in a Makefile.
+# this file has to be altered to change AC_OUTPUT anyway
+POTFILE_IN_DEPS="`(cd ${srcdir}/src/ && find . -name Makefile.am) | sed
+s+\./+\$\(top_srcdir\)/src/+ | tr \\\n " "`"
+AC_SUBST(POTFILE_IN_DEPS)
AC_SUBST(LINGUAS)
Index: po/Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.in.in
--- po/Makefile.in.in 2000/10/24 17:53:50 1.9
+++ po/Makefile.in.in 2000/12/13 19:23:42
@@ -49,8 +49,6 @@ GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-POTFILE_IN_DEPS := $(shell find $(top_srcdir)/src -name Makefile.am)
-
POTFILES = \
CATALOGS = @CATALOGS@
@@ -236,7 +234,7 @@ update-po: Makefile
fi; \
done
-${srcdir}/POTFILES.in: $(top_srcdir)/src/ext_l10n.h $(POTFILE_IN_DEPS)
+${srcdir}/POTFILES.in: $(top_srcdir)/src/ext_l10n.h @POTFILE_IN_DEPS@
rm -f $@-t \
&& ( cd $(top_srcdir); \
grep -l -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
