From: Andy Wingo <wingo@pobox.com>
Date: Fri, 29 May 2009 14:01:43 +0000 (+0200)
Subject: Merge branch 'syncase-in-boot-9'
X-Git-Url: http://git.hcoop.net/bpt/guile.git/commitdiff_plain/938d46a35d39ec5d7b5fa858a8783136ce24d10d

Merge branch 'syncase-in-boot-9'

Conflicts:
	module/Makefile.am
---

938d46a35d39ec5d7b5fa858a8783136ce24d10d
diff --cc module/Makefile.am
index d149bb64a,35959e294..9d9a839a1
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@@ -53,9 -46,9 +46,10 @@@ SOURCES =								
  									\
    $(ICE_9_SOURCES)							\
    $(SRFI_SOURCES)							\
 +  $(RNRS_SOURCES)							\
    $(OOP_SOURCES)							\
- 									\
+   $(SYSTEM_SOURCES)                                                     \
+   $(ECMASCRIPT_LANG_SOURCES)						\
    $(SCRIPTS_SOURCES)
  
  ## test.scm is not currently installed.