Skip to content

Commit

Permalink
fix compilation for lua modular on cygwin
Browse files Browse the repository at this point in the history 
remove double '/' on make install; compile and install with
make install DESTDIR=
when you are on cygwin to fix issue with special //name/
  • Loading branch information
Soeren Sonnenburg committed Dec 9, 2011
1 parent f77788a commit e283bf5
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions src/Makefile.template
View file
Expand Up @@ -296,22 +296,22 @@ install-octave_modular: $(TEMPLATE_TARGET)
>>$(DESTDIR)$(OCTDIR)/shogun/init_shogun.m; done

install-java_modular: $(TEMPLATE_TARGET)
install -d -m755 "$(DESTDIR)/$(PREFIX)/share/java"
install -d -m755 "$(DESTDIR)$(PREFIX)/share/java"
install -d -m755 "$(DESTDIR)$(LIBDIR)/jni"
install -m644 shogun.jar "$(DESTDIR)/$(PREFIX)/share/java"
install -m644 shogun.jar "$(DESTDIR)$(PREFIX)/share/java"
install -m755 $(SWIGLIBFILES) "$(DESTDIR)$(LIBDIR)/jni"

install-ruby_modular: $(TEMPLATE_TARGET)
install -d -m755 "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)"
install -m755 modshogun$(EXT_LIB_SWIG_RUBY_MODULAR) "$(DESTDIR)/$(RUBY_EXTENSIONS_INSTALL_DIR)/"
install -d -m755 "$(DESTDIR)$(RUBY_EXTENSIONS_INSTALL_DIR)"
install -m755 modshogun$(EXT_LIB_SWIG_RUBY_MODULAR) "$(DESTDIR)$(RUBY_EXTENSIONS_INSTALL_DIR)/"

install-lua_modular: $(TEMPLATE_TARGET)
install -d -m755 "$(DESTDIR)/$(LUA_EXTENSIONS_INSTALL_DIR)"
install -m755 modshogun.$(EXT_LIB) "$(DESTDIR)/$(LUA_EXTENSIONS_INSTALL_DIR)"
install -d -m755 "$(DESTDIR)$(LUA_EXTENSIONS_INSTALL_DIR)"
install -m755 modshogun.$(EXT_LIB) "$(DESTDIR)$(LUA_EXTENSIONS_INSTALL_DIR)"

install-csharp_modular: $(TEMPLATE_TARGET)
install -d -m755 "$(DESTDIR)/$(LIBDIR)/cli/shogun"
install -m644 modshogun.dll "$(DESTDIR)/$(LIBDIR)/cli/shogun"
install -d -m755 "$(DESTDIR)$(LIBDIR)/cli/shogun"
install -m644 modshogun.dll "$(DESTDIR)$(LIBDIR)/cli/shogun"
install -m755 $(SWIGLIBFILES) "$(DESTDIR)$(LIBDIR)/cli/shogun"

run-testsuite: run-testsuite-template
Expand Down
12 changes: 6 additions & 6 deletions src/configure
View file
Expand Up @@ -834,14 +834,14 @@ test_lua()
SWIGFLAGS_LUA_MODULAR="-c++ -lua"

INCLUDES_LUA="`pkg-config --cflags-only-I lua$LV 2>/dev/null`"
LINKFLAGS_LUA="`pkg-config --libs lua$LV 2>/dev/null`"
POSTLINKFLAGS_LUA="`pkg-config --libs lua$LV 2>/dev/null`"
LUA_EXTENSIONS_INSTALL_DIR="`pkg-config lua$LV --define-variable prefix=$_prefix --variable INSTALL_CMOD`"

if test -z "$INCLUDES_LUA" ; then
INCLUDES_LUA="`pkg-config --cflags-only-I lua 2>/dev/null`"
fi
if test -z "$LINKFLAGS_LUA" ; then
LINKFLAGS_LUA="`pkg-config --libs lua 2>/dev/null`"
if test -z "$POSTLINKFLAGS_LUA" ; then
POSTLINKFLAGS_LUA="`pkg-config --libs lua 2>/dev/null`"
fi
if test -z "$LUA_EXTENSIONS_INSTALL_DIR" ; then
LUA_EXTENSIONS_INSTALL_DIR="`pkg-config lua --define-variable prefix=$_prefix --variable INSTALL_CMOD`"
Expand All @@ -851,11 +851,11 @@ test_lua()
if test -z "$INCLUDES_LUA" ; then
INCLUDES_LUA="-I/usr/include/lua${LV} -I/usr/local/include/lua${LV}"
fi
if test -z "$LINKFLAGS_LUA" ; then
LINKFLAGS_LUA="-llua${LV}"
if test -z "$POSTLINKFLAGS_LUA" ; then
POSTLINKFLAGS_LUA="-llua${LV}"
fi

LINKFLAGS_LUA="$LINKFLAGS_LUA --shared"
POSTLINKFLAGS_LUA="$POSTLINKFLAGS_LUA --shared"
echores "${LUAVER}"
_lua_modular=yes
else
Expand Down

0 comments on commit e283bf5

Please sign in to comment.