[Guile-commits] 01/02: In libpath.h, use absolute paths on MinGW

[Mike Gran]

mike121 pushed a commit to branch wip-mingw-guile-2.2
in repository guile.

commit 7b6c48359574d88cd57ee0c88880dc547c791ffd
Author: Michael Gran <address@hidden>
Date:   Mon Apr 16 19:06:31 2018 -0700

    In libpath.h, use absolute paths on MinGW
    
    * libguile/Makefile.am (libpath.h): convert msys paths to absolute paths
---
 libguile/Makefile.am | 56 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 0fceee0..2b8091c 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -717,37 +717,37 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads              
                \
 libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @rm -f libpath.tmp
        @echo '/* generated by Makefile */' > libpath.tmp
-       @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
-       @echo '#define SCM_LIBRARY_DIR 
"$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
-       @echo '#define SCM_SITE_DIR "$(sitedir)"' >> libpath.tmp
-       @echo '#define SCM_GLOBAL_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
-       @echo '#define SCM_LIB_DIR "$(libdir)"' >> libpath.tmp
-       @echo '#define SCM_EXTENSIONS_DIR 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
-       @echo '#define SCM_CCACHE_DIR 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
-       @echo '#define SCM_SITE_CCACHE_DIR 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache"' >> libpath.tmp
-       @echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> 
libpath.tmp
+       @echo '#define SCM_PKGDATA_DIR "'`$(CYGPATH_W) $(pkgdatadir) | $(SED) 
's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
+       @echo '#define SCM_LIBRARY_DIR "'`$(CYGPATH_W) 
$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION) | $(SED) 
's/\\\\/\\\\\\\\/g'`'"'>>libpath.tmp
+       @echo '#define SCM_SITE_DIR "'`$(CYGPATH_W) $(sitedir) | $(SED) 
's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
+       @echo '#define SCM_GLOBAL_SITE_DIR "'`$(CYGPATH_W) $(pkgdatadir)/site | 
$(SED) 's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
+       @echo '#define SCM_LIB_DIR "'`$(CYGPATH_W) $(libdir) | $(SED) 
's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
+       @echo '#define SCM_EXTENSIONS_DIR "'`$(CYGPATH_W) 
$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions | $(SED) 
's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
+       @echo '#define SCM_CCACHE_DIR "'`$(CYGPATH_W) 
$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache | $(SED) 's/\\\\/\\\\\\\\/g'`'"' 
>> libpath.tmp
+       @echo '#define SCM_SITE_CCACHE_DIR "'`$(CYGPATH_W) 
$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache | $(SED) 
's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
+       @echo '#define SCM_EFFECTIVE_VERSION "'`$(CYGPATH_W) 
$(GUILE_EFFECTIVE_VERSION) | $(SED) 's/\\\\/\\\\\\\\/g'`'"' >> libpath.tmp
        @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
-       @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
-       @echo ' { "top_srcdir",    "@top_srcdir_absolute@" }, \' >> libpath.tmp
-       @echo ' { "prefix",        "@prefix@" }, \' >> libpath.tmp
-       @echo ' { "exec_prefix",   "@exec_prefix@" }, \' >> libpath.tmp
-       @echo ' { "bindir",        "@bindir@" }, \' >> libpath.tmp
-       @echo ' { "sbindir",       "@sbindir@" }, \' >> libpath.tmp
-       @echo ' { "libexecdir",    "@libexecdir@" }, \' >> libpath.tmp
-       @echo ' { "datadir",       "@datadir@" }, \' >> libpath.tmp
-       @echo ' { "sysconfdir",    "@sysconfdir@" }, \' >> libpath.tmp
-       @echo ' { "sharedstatedir", "@sharedstatedir@" }, \' >> libpath.tmp
-       @echo ' { "localstatedir", "@localstatedir@" }, \' >> libpath.tmp
-       @echo ' { "libdir",        "@libdir@" }, \' >> libpath.tmp
+       @echo ' { "srcdir",        "'`cd @srcdir@; pwd | xargs $(CYGPATH_W) | 
$(SED) 's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "top_srcdir",    "'`$(CYGPATH_W) @top_srcdir_absolute@ | 
$(SED) 's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "prefix",        "'`$(CYGPATH_W) @prefix@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "exec_prefix",   "'`$(CYGPATH_W) @exec_prefix@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "bindir",        "'`$(CYGPATH_W) @bindir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "sbindir",       "'`$(CYGPATH_W) @sbindir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "libexecdir",    "'`$(CYGPATH_W) @libexecdir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "datadir",       "'`$(CYGPATH_W) @datadir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "sysconfdir",    "'`$(CYGPATH_W) @sysconfdir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "sharedstatedir", "'`$(CYGPATH_W) @sharedstatedir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "localstatedir", "'`$(CYGPATH_W) @localstatedir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "libdir",        "'`$(CYGPATH_W) @libdir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
        @echo ' { "ccachedir",     SCM_CCACHE_DIR }, \' >> libpath.tmp
-       @echo ' { "infodir",       "@infodir@" }, \' >> libpath.tmp
-       @echo ' { "mandir",        "@mandir@" }, \' >> libpath.tmp
-       @echo ' { "includedir",    "@includedir@" }, \' >> libpath.tmp
-       @echo ' { "pkgdatadir",    "$(pkgdatadir)" }, \' >> libpath.tmp
-       @echo ' { "pkglibdir",     "$(pkglibdir)" }, \' >> libpath.tmp
-       @echo ' { "pkgincludedir", "$(pkgincludedir)" }, \' \
+       @echo ' { "infodir",       "'`$(CYGPATH_W) @infodir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "mandir",        "'`$(CYGPATH_W) @mandir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "includedir",    "'`$(CYGPATH_W) @includedir@ | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "pkgdatadir",    "'`$(CYGPATH_W) $(pkgdatadir)  | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "pkglibdir",     "'`$(CYGPATH_W) $(pkglibdir)  | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
+       @echo ' { "pkgincludedir", "'`$(CYGPATH_W) $(pkgincludedir)  | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' \
                >> libpath.tmp
-       @echo ' { "extensiondir", 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions" }, \' >> libpath.tmp
+       @echo ' { "extensiondir", "'`$(CYGPATH_W) 
$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions | $(SED) 
's/\\\\/\\\\\\\\/g'`'" }, \' >> libpath.tmp
        @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
        @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
                >> libpath.tmp