Move C and Scheme code into subdirs.

22 files changed, 7 insertions, 3 deletions

diff --git a/config.scm b/module/config.scm
index 3c6ebbb0..3c6ebbb0 100644
--- a/config.scm
+++ b/module/config.scm
diff --git a/exceptions.scm b/module/exceptions.scm
index 027c75ee..027c75ee 100644
--- a/exceptions.scm
+++ b/module/exceptions.scm
diff --git a/fetch.scm b/module/fetch.scm
index a91e4d0d..a91e4d0d 100755
--- a/fetch.scm
+++ b/module/fetch.scm
diff --git a/helpers.scm b/module/helpers.scm
index 717a10d4..717a10d4 100644
--- a/helpers.scm
+++ b/module/helpers.scm
diff --git a/main.scm b/module/main.scm
index 223b3d2e..223b3d2e 100755
--- a/main.scm
+++ b/module/main.scm
diff --git a/srfi/srfi-19/setters.scm b/module/srfi/srfi-19/setters.scm
index 45876382..45876382 100644
--- a/srfi/srfi-19/setters.scm
+++ b/module/srfi/srfi-19/setters.scm
diff --git a/srfi/srfi-19/util.scm b/module/srfi/srfi-19/util.scm
index a4b704b0..a4b704b0 100644
--- a/srfi/srfi-19/util.scm
+++ b/module/srfi/srfi-19/util.scm
diff --git a/srfi/srfi-41/util.scm b/module/srfi/srfi-41/util.scm
index 5bef95cb..5bef95cb 100644
--- a/srfi/srfi-41/util.scm
+++ b/module/srfi/srfi-41/util.scm
diff --git a/terminal/escape.scm b/module/terminal/escape.scm
index 8f1b0c2b..8f1b0c2b 100644
--- a/terminal/escape.scm
+++ b/module/terminal/escape.scm
diff --git a/terminal/termios.scm b/module/terminal/termios.scm
index b0ae585e..50683f84 100644
--- a/terminal/termios.scm
+++ b/module/terminal/termios.scm
@@ -7,5 +7,7 @@
 (define-public ECHO	#x0000010)
 (define-public ICANON	#x0000002)
 
-(setenv "LD_LIBRARY_PATH" (dirname (dirname (current-filename))))
+(setenv "LD_LIBRARY_PATH"
+        (string-append (dirname (dirname (dirname (current-filename))))
+                       "/lib"))
 (load-extension "libtermios" "init_termios")
diff --git a/terminal/util.scm b/module/terminal/util.scm
index a7435ad8..a7435ad8 100644
--- a/terminal/util.scm
+++ b/module/terminal/util.scm
diff --git a/test.scm b/module/test.scm
index 1b3c539e..10c6c1a1 100755
--- a/test.scm
+++ b/module/test.scm
@@ -12,7 +12,7 @@
              (vcalendar output)
              (vcalendar recur))
 
-(define cal (make-vcomponent "testcal/repeating-event.ics"))
+(define cal (make-vcomponent "../testcal/repeating-event.ics"))
 
 (define ev (car (children cal 'VEVENT)))
 
diff --git a/util.scm b/module/util.scm
index 6f1b955a..6f1b955a 100644
--- a/util.scm
+++ b/module/util.scm
diff --git a/vcalendar.scm b/module/vcalendar.scm
index 3f7ba6ba..3f7ba6ba 100644
--- a/vcalendar.scm
+++ b/module/vcalendar.scm
diff --git a/vcalendar/control.scm b/module/vcalendar/control.scm
index a38d678f..a38d678f 100644
--- a/vcalendar/control.scm
+++ b/module/vcalendar/control.scm
diff --git a/vcalendar/datetime.scm b/module/vcalendar/datetime.scm
index 360b8348..360b8348 100644
--- a/vcalendar/datetime.scm
+++ b/module/vcalendar/datetime.scm
diff --git a/vcalendar/output.scm b/module/vcalendar/output.scm
index e4635beb..e4635beb 100644
--- a/vcalendar/output.scm
+++ b/module/vcalendar/output.scm
diff --git a/vcalendar/primitive.scm b/module/vcalendar/primitive.scm
index fdce550c..b5eb9388 100644
--- a/vcalendar/primitive.scm
+++ b/module/vcalendar/primitive.scm
@@ -17,5 +17,7 @@
 
             %vcomponent-shallow-copy))
 
-(setenv "LD_LIBRARY_PATH" (dirname (dirname (current-filename))))
+(setenv "LD_LIBRARY_PATH"
+        (string-append (dirname (dirname (dirname (current-filename))))
+                       "/lib"))
 (load-extension "libguile-calendar" "init_lib")
diff --git a/vcalendar/recur.scm b/module/vcalendar/recur.scm
index 3657cae6..3657cae6 100644
--- a/vcalendar/recur.scm
+++ b/module/vcalendar/recur.scm
diff --git a/vcalendar/recurrence/generate.scm b/module/vcalendar/recurrence/generate.scm
index fae404ec..fae404ec 100644
--- a/vcalendar/recurrence/generate.scm
+++ b/module/vcalendar/recurrence/generate.scm
diff --git a/vcalendar/recurrence/internal.scm b/module/vcalendar/recurrence/internal.scm
index b62d75c2..b62d75c2 100644
--- a/vcalendar/recurrence/internal.scm
+++ b/module/vcalendar/recurrence/internal.scm
diff --git a/vcalendar/recurrence/parse.scm b/module/vcalendar/recurrence/parse.scm
index abead3a9..abead3a9 100644
--- a/vcalendar/recurrence/parse.scm
+++ b/module/vcalendar/recurrence/parse.scm