r19013 - gnucash/trunk/src/engine - Change the iso-4217 generator script to accept the srcdir as cmdline argument instead of an env variable.

[Christian Stimming]

Author: cstim
Date: 2010-04-10 15:44:02 -0400 (Sat, 10 Apr 2010)
New Revision: 19013
Trac: http://svn.gnucash.org/trac/changeset/19013

Modified:
   gnucash/trunk/src/engine/CMakeLists.txt
   gnucash/trunk/src/engine/Makefile.am
   gnucash/trunk/src/engine/iso-currencies-to-c
Log:
Change the iso-4217 generator script to accept the srcdir as cmdline argument instead of an env variable.

Modified: gnucash/trunk/src/engine/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/engine/CMakeLists.txt	2010-04-10 19:33:25 UTC (rev 19012)
+++ gnucash/trunk/src/engine/CMakeLists.txt	2010-04-10 19:44:02 UTC (rev 19013)
@@ -62,9 +62,7 @@
   OUTPUT ${ISO_4217_C}
   DEPENDS iso-4217-currencies.scm iso-currencies-to-c
   COMMAND
-    GUILE_LOAD_PATH=@GNC_SRFI_LOAD_PATH@:${GUILE_LOAD_PATH}
-	srcdir=${CMAKE_CURRENT_SOURCE_DIR}
-	${GUILE_EXECUTABLE} -s ${CMAKE_CURRENT_SOURCE_DIR}/iso-currencies-to-c
+    ${GUILE_EXECUTABLE} -s "${CMAKE_CURRENT_SOURCE_DIR}/iso-currencies-to-c" "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 # Add dependency on iso-4217-currencies.c
 SET_SOURCE_FILES_PROPERTIES (gnc-commodity.c PROPERTIES OBJECT_DEPENDS ${ISO_4217_C})

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2010-04-10 19:33:25 UTC (rev 19012)
+++ gnucash/trunk/src/engine/Makefile.am	2010-04-10 19:44:02 UTC (rev 19013)
@@ -166,7 +166,7 @@
 
 iso-4217-currencies.c: iso-4217-currencies.scm iso-currencies-to-c
 	-chmod u+x ${srcdir}/iso-currencies-to-c
-	srcdir=${srcdir} ${srcdir}/iso-currencies-to-c
+	${srcdir}/iso-currencies-to-c "${srcdir}"
 
 BUILT_SOURCES = iso-4217-currencies.c
 

Modified: gnucash/trunk/src/engine/iso-currencies-to-c
===================================================================
--- gnucash/trunk/src/engine/iso-currencies-to-c	2010-04-10 19:33:25 UTC (rev 19012)
+++ gnucash/trunk/src/engine/iso-currencies-to-c	2010-04-10 19:44:02 UTC (rev 19013)
@@ -10,7 +10,13 @@
       (export simple-format)
       (define simple-format format)))
 
-(define *currency-file* (string-append (getenv "srcdir") "/" "iso-4217-currencies.scm"))
+(if (< (length (command-line)) 2)
+    (begin
+      (display "Missing command line argument \"source directory\"")
+      (exit 1)))
+
+(define *srcdir* (list-ref (command-line) 1))
+(define *currency-file* (string-append *srcdir* "/" "iso-4217-currencies.scm"))
 (define *c-file-name* "iso-4217-currencies.c")
 
 (define (generate-currency-c-code form output-port)