sign off

eyedouble · Apr 4, 2018 · 16a8e9e · 16a8e9e
1 parent 8202deb
commit 16a8e9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/c_src/Makefile b/c_src/Makefile
@@ -32,6 +32,7 @@ else
 endif
 
 BASEDIR := $(abspath $(CURDIR)/..)
+PRIVDIR := $(abspath $(CURDIR)/../priv)
 PROJECT ?= $(notdir $(BASEDIR))
 PROJECT := $(strip $(PROJECT))
 
@@ -67,17 +68,17 @@ CXXFLAGS ?= -O3 -finline-functions -Wall
 #
 #	Compilation
 #
-CFLAGS += -I "$(ERTS_INCLUDE_DIR)" -I "$(ERL_INTERFACE_INCLUDE_DIR)" -I "libsass/include" -I "libsass"
-CXXFLAGS += -I "$(ERTS_INCLUDE_DIR)" -I "$(ERL_INTERFACE_INCLUDE_DIR)"  -I "libsass/include" "../priv/libsass.dll"
+CFLAGS += -I "$(ERTS_INCLUDE_DIR)" -I "$(ERL_INTERFACE_INCLUDE_DIR)"
+CXXFLAGS += -I "$(ERTS_INCLUDE_DIR)" -I "$(ERL_INTERFACE_INCLUDE_DIR)"  -I "libsass/include" "$(PRIVDIR)/libsass$(SLEXT)"
 
 
 LDLIBS += -L "$(ERL_INTERFACE_LIB_DIR)" -lerl_interface -lei
 LDFLAGS += -shared
 
-# $(info ${OS})
-# $(info ${OSNAME})
-# $(info ${CURDIR})
-# $(info ${PROJECT})
+$(info ${OS})
+$(info ${OSNAME})
+$(info ${CURDIR})
+$(info ${PRIVDIR})
 # $(info ${ERTS_INCLUDE_DIR})
 # $(info ${ERL_INTERFACE_INCLUDE_DIR})
 # $(info ${ERL_INTERFACE_LIB_DIR})

diff --git a/src/erlsass.erl b/src/erlsass.erl
@@ -55,7 +55,8 @@ init() ->
     case os:type() of
         {win32, _Osname} -> 
             Path = os:getenv("PATH"),
-            os:putenv("PATH", Path ++ PrivDir ++ ";")
+            os:putenv("PATH", Path ++ PrivDir ++ ";");
+        _True -> ok
     end,    
 
     SharedLib = filename:join(PrivDir, ?LIBNAME),