Hi folks,
Here is that Makefile.am patch I sent in last night, against this morning's
CVS (it will just save someone a few minutes of time, not having to
fix the ChangeLog conflict).
You might want to commit this before doing other Makefile.am changes.
---Kayvan
--
Kayvan A. Sylvan | Proud husband of | Father to my kids:
Sylvan Associates, Inc. | Laura Isabella Sylvan | Katherine Yelena
http://www.successlinks.com/kayvan | Reach your goals now! | Robin Gregory
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.456
diff -u -u -r1.456 ChangeLog
--- ChangeLog 2000/07/28 14:28:52 1.456
+++ ChangeLog 2000/07/28 16:29:21
@@ -36,6 +36,13 @@
* src/lyxfunc.C: ditto
* lib/ui/default.ui: ditto
+2000-07-27 Kayvan A. Sylvan <[EMAIL PROTECTED]>
+
+ * Makefile.am: Fix ``rpmdist'' target to return the exit
+ status of the ``rpm'' command, instead of the last command in
+ the chain (the ``rm lyx.xpm'' command, which always returns
+ success).
+
2000-07-27 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* src/frontends/xforms/forms/makefile (.c.C): change call to fdfix.sh.
Index: Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Makefile.am,v
retrieving revision 1.13
diff -u -u -r1.13 Makefile.am
--- Makefile.am 2000/07/27 08:55:56 1.13
+++ Makefile.am 2000/07/28 16:29:21
@@ -26,8 +26,8 @@
rpmdist: dist
ln -s lib/images/lyx.xpm . ; \
- rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
- rm lyx.xpm
+ rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
+ rm lyx.xpm; exit $$saved_status
bindist:
