diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-03-03 16:03:13 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-03-03 16:03:13 (GMT) |
| commit | c5ce2ec4e3988a95a8cc47cf9c4698ff6db5af67 (patch) | |
| tree | 839251692c4f3ab410bb8d3d31cddd69e8ee68e8 | |
| parent | c2b04c01758ab3e838cf0e16df192f7f377bc971 (diff) | |
| download | mxe-c5ce2ec4e3988a95a8cc47cf9c4698ff6db5af67.zip mxe-c5ce2ec4e3988a95a8cc47cf9c4698ff6db5af67.tar.gz mxe-c5ce2ec4e3988a95a8cc47cf9c4698ff6db5af67.tar.bz2 | |
package guile: tidy up test program
| -rw-r--r-- | src/guile-test.c | 5 | ||||
| -rw-r--r-- | src/guile.mk | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/guile-test.c b/src/guile-test.c index 77e95ae..f3a6ef6 100644 --- a/src/guile-test.c +++ b/src/guile-test.c @@ -11,9 +11,6 @@ int putenv (char *); # endif -#define xstr(s) str(s) -#define str(s) #s - static void inner_main(void *data, int argc, char *argv[]) { (void)data; @@ -26,7 +23,7 @@ int main(int argc, char *argv[]) { char guile_load_path[40]; snprintf(guile_load_path, sizeof guile_load_path, \ - "GUILE_LOAD_PATH=..\\share\\guile\\%s", xstr(GUILE_MAJOR_MINOR)); + "GUILE_LOAD_PATH=..\\share\\guile\\%s", GUILE_MAJOR_MINOR); putenv(guile_load_path); scm_boot_guile(argc, argv, inner_main, NULL); return 0; diff --git a/src/guile.mk b/src/guile.mk index 3a39c31..3e45d72 100644 --- a/src/guile.mk +++ b/src/guile.mk @@ -35,6 +35,6 @@ define $(PKG)_BUILD '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-guile.exe' \ - `'$(TARGET)-pkg-config' guile-1.8 --cflags --libs` \ - -DGUILE_MAJOR_MINOR=$(call SHORT_PKG_VERSION,$(PKG)) + `'$(TARGET)-pkg-config' guile-$(call SHORT_PKG_VERSION,$(PKG)) --cflags --libs` \ + -DGUILE_MAJOR_MINOR=\"$(call SHORT_PKG_VERSION,$(PKG))\" endef |