diff --git stfl-0.19/Makefile stfl-0.19-ta/Makefile
index f098187..80dd338 100644
--- stfl-0.19/Makefile
+++ stfl-0.19-ta/Makefile
@@ -39,7 +39,7 @@ clean:
 	rm -f widgets/*.o spl/mod_stfl.so spl/example.db
 	cd perl5 && perl Makefile.PL && make clean && rm -f Makefile.old
 	rm -f perl5/stfl_wrap.c perl5/stfl.pm perl5/build_ok
-	rm -f python/stfl.py python/stfl.pyc python/_stfl.so 
+	rm -f python/stfl.py python/_stfl.so 
 	rm -f python/stfl_wrap.c python/stfl_wrap.o
 	rm -f ruby/Makefile ruby/stfl_wrap.c ruby/stfl_wrap.o
 	rm -f ruby/stfl.so ruby/build_ok Makefile.deps_new
@@ -50,9 +50,9 @@ Makefile.deps: *.c widgets/*.c *.h
 	mv -f Makefile.deps_new Makefile.deps
 
 install: all
-	mkdir -p $(DESTDIR)$(prefix)/lib
+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)
 	mkdir -p $(DESTDIR)$(prefix)/include
-	install -m 644 libstfl.a $(DESTDIR)$(prefix)/lib/
+	install -m 644 libstfl.a $(DESTDIR)$(prefix)/$(LIBDIR)/
 	install -m 644 stfl.h $(DESTDIR)$(prefix)/include/
 
 ifeq ($(FOUND_SPL),1)
diff --git stfl-0.19/python/Makefile.snippet stfl-0.19-ta/python/Makefile.snippet
index 65e7a3d..a8d830c 100644
--- stfl-0.19/python/Makefile.snippet
+++ stfl-0.19-ta/python/Makefile.snippet
@@ -21,19 +21,17 @@
 
 PYTHON_VERSION = $(shell python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d'.')
 
-all: python/_stfl.so python/stfl.py python/stfl.pyc
+all: python/_stfl.so python/stfl.py
 
 install: install_python
 
-python/_stfl.so python/stfl.py python/stfl.pyc: libstfl.a stfl.h python/stfl.i swig/*.i
+python/_stfl.so python/stfl.py: libstfl.a stfl.h python/stfl.i swig/*.i
 	cd python && swig -python stfl.i
 	gcc -shared -pthread -fPIC python/stfl_wrap.c -I/usr/include/python$(PYTHON_VERSION) \
 		-I. libstfl.a -lncursesw -o python/_stfl.so
-	cd python && python -c 'import stfl'
 
-install_python: python/_stfl.so python/stfl.py python/stfl.pyc
-	mkdir -p $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
-	cp python/_stfl.so $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/lib-dynload/
-	cp python/stfl.pyc $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
-	cp python/stfl.py $(DESTDIR)$(prefix)/lib/python$(PYTHON_VERSION)/
+install_python: python/_stfl.so python/stfl.py
+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
+	cp python/_stfl.so $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/lib-dynload/
+	cp python/stfl.py $(DESTDIR)$(prefix)/$(LIBDIR)/python$(PYTHON_VERSION)/
 
diff --git stfl-0.19/ruby/Makefile.snippet stfl-0.19-ta/ruby/Makefile.snippet
index 74dfa9b..f0ced6f 100644
--- stfl-0.19/ruby/Makefile.snippet
+++ stfl-0.19-ta/ruby/Makefile.snippet
@@ -25,9 +25,9 @@ install: install_ruby
 
 ruby/build_ok: libstfl.a stfl.h ruby/stfl.i swig/*.i
 	cd ruby && swig -ruby stfl.i && ruby extconf.rb
-	$(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/lib/ruby
+	$(MAKE) -C ruby clean && $(MAKE) -C ruby LIBS+="../libstfl.a -lncursesw" CFLAGS+="-pthread -I.." DLDFLAGS+="-pthread" DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir=$(prefix)/$(LIBDIR)/ruby
 	touch ruby/build_ok
 
 install_ruby: ruby/build_ok
-	$(MAKE) -C ruby DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir='$(DESTDIR)$(prefix)/lib/ruby' install
+	$(MAKE) -C ruby DESTDIR=$(DESTDIR) prefix=$(prefix) sitedir='$(DESTDIR)$(prefix)/$(LIBDIR)/ruby' install