[PATCH packages] Fix ethio-util compilation in mule-base

Jerry James <[email protected]> Mon, 29 Sep 2014 21:47:24 -0600
Newsgroups gmane.emacs.xemacs.patches
Message-ID <CAHCOHQnOeuyfB74M2U943DJwUro2pBsxwwbrYt2PMCagSfWhfQ@mail.gmail.com>
PATCH packages

I messed up the logic for compiling ethio-util.el with a recent patch.
This fixes the Makefile so that ethio-util.el is not byte compiled when
building with 21.4, but is when building with 21.5

diff -r bfa0cf1e094d mule-packages/mule-base/ChangeLog
--- a/mule-packages/mule-base/ChangeLog Sun Jun 22 09:01:47 2014 +0200
+++ b/mule-packages/mule-base/ChangeLog Mon Sep 29 15:28:12 2014 -0600
@@ -1,3 +1,8 @@
+2014-09-29  Jerry James  <[email protected]>
+
+ * Makefile: Put ethio-util.el in EXTRA_SOURCES if building with
+ XEmacs 21.4, and ethio-util.elc in ELCS if XEmacs 21.5.
+
 2014-06-22  Norbert Koch  <[email protected]>

  * Makefile (VERSION): XEmacs package 1.59 released.
diff -r bfa0cf1e094d mule-packages/mule-base/Makefile
--- a/mule-packages/mule-base/Makefile Sun Jun 22 09:01:47 2014 +0200
+++ b/mule-packages/mule-base/Makefile Mon Sep 29 15:28:12 2014 -0600
@@ -29,11 +29,15 @@
  cyril-util.elc kana-keyboard.elc korea-util.elc isearch-mule.elc \
  japan-util.elc mule-cne.elc mule-diag.elc mule-keyboard.elc \
  mule-trex.elc mule-util.elc thai-xtis-util.elc viet-util.elc \
- ethio-util.elc fsf-compat-unicode.elc
+ fsf-compat-unicode.elc
+
+include ../../Local.rules

 # The following are shipped unbytecompiled if built by XEmacs 21.4 or
earlier
 # because they aren't grokked by those versions.
 ifeq ($(XEMACS_21_5),t)
+ELCS += ethio-util.elc
+else
 EXTRA_SOURCES = ethio-util.el
 endif

-- 
Jerry James
http://www.jamezone.org/

_______________________________________________
XEmacs-Patches mailing list
[email protected]
http://lists.xemacs.org/mailman/listinfo/xemacs-patches