diff --git a/Makefile.in b/Makefile.in
index 58aca2a..4426fa9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,13 +33,13 @@ ELF_HASH_STYLE 		= @elf_hash_style@
 ELF_CONFIG_DEFS 	= @elf_config_defs@
 
 PREFIX 			= @prefix@
-BIN_DIR 		= @bindir@
-LIB_DIR 		= @libdir@
-INCLUDE_DIR 		= @includedir@
-SYSLIB_DIR 		= @syslibdir@
-MAN_DIR 		= @mandir@
-DOC_DIR 		= @docdir@
-LIBEXEC_DIR 		= @libexecdir@
+BINDIR 			= @bindir@
+LIBDIR 			= @libdir@
+INCLUDEDIR 		= @includedir@
+SYSLIBDIR 		= @syslibdir@
+MANDIR 			= @mandir@
+DOCDIR 			= @docdir@
+LIBEXECDIR 		= @libexecdir@
 
 NATIVE_CC 		= @native_cc@
 NATIVE_OS 		= @native_os@
@@ -77,10 +77,10 @@ src/%.lo: 	$(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag
 src/%.o: 	$(PROJECT_DIR)/src/%.c $(ALL_HEADERS) host.tag
 		$(CC) -c -o $@ $< $(CFLAGS_STATIC)
 
-$(LIB_DIR)/%$(OS_LIB_SUFFIX):
+$(LIBDIR)/%$(OS_LIB_SUFFIX):
 		$(CC) -shared -o $@ $^ $(LDFLAGS_SHARED)
 
-$(LIB_DIR)/%$(OS_ARCHIVE_EXT):
+$(LIBDIR)/%$(OS_ARCHIVE_EXT):
 		rm -f $@
 		$(AR) -rcs $@ $^
 
@@ -96,20 +96,20 @@ app:		default-app
 install-libs:	install-shared install-static install-implib
 
 install-headers:shared static
-		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(INCLUDE_DIR)/$(PACKAGE)
-		cp $(API_HEADERS) $(DESTDIR)/./$(PREFIX)/./$(INCLUDE_DIR)/$(PACKAGE)
+		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)
+		cp $(API_HEADERS) $(DESTDIR)/./$(PREFIX)/./$(INCLUDEDIR)/$(PACKAGE)
 
 install-shared:	shared install-implib
-		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
-		cp $(SHARED_LIB) $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
+		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
+		cp $(SHARED_LIB) $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
 
 install-static:	static
-		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
-		cp $(STATIC_LIB) $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
+		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
+		cp $(STATIC_LIB) $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
 
 install-app:	app
-		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(BIN_DIR)
-		cp $(APP) $(DESTDIR)/./$(PREFIX)/./$(BIN_DIR)
+		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(BINDIR)
+		cp $(APP) $(DESTDIR)/./$(PREFIX)/./$(BINDIR)
 
 
 
@@ -161,8 +161,8 @@ $(STATIC_APP):	$(STATIC_OBJS) $(APP_OBJS)
 dirs: 		dirs.tag tree.tag
 
 dirs.tag:
-		mkdir -p $(BIN_DIR)
-		mkdir -p $(LIB_DIR)
+		mkdir -p $(BINDIR)
+		mkdir -p $(LIBDIR)
 		touch dirs.tag
 
 host.tag:	Makefile
@@ -254,13 +254,13 @@ clean:
 
 .display-dirs:
 		@echo PREFIX:'                 '$(PREFIX)
-		@echo BIN_DIR:'                '$(BIN_DIR)
-		@echo LIB_DIR:'                '$(LIB_DIR)
-		@echo INCLUDE_DIR:'            '$(INCLUDE_DIR)
-		@echo SYSLIB_DIR:'             '$(SYSLIB_DIR)
-		@echo MAN_DIR:'                '$(MAN_DIR)
-		@echo DOC_DIR:'                '$(DOC_DIR)
-		@echo LIBEXEC_DIR:'            '$(LIBEXEC_DIR)
+		@echo BINDIR:'                 '$(BINDIR)
+		@echo LIBDIR:'                 '$(LIBDIR)
+		@echo INCLUDEDIR:'             '$(INCLUDEDIR)
+		@echo SYSLIBDIR:'              '$(SYSLIBDIR)
+		@echo MANDIR:'                 '$(MANDIR)
+		@echo DOCDIR:'                 '$(DOCDIR)
+		@echo LIBEXECDIR:'             '$(LIBEXECDIR)
 		@echo
 
 .display-build:
diff --git a/configure b/configure
index 5af5573..f3eca4e 100755
--- a/configure
+++ b/configure
@@ -24,13 +24,13 @@ init_vars()
 
 	# dirs
 	mb_prefix=$PREFIX
-	mb_bindir=$BIN_DIR
-	mb_libdir=$LIB_DIR
-	mb_includedir=$INCLUDE_DIR
-	mb_syslibdir=$LIB_DIR
-	mb_mandir=$MAN_DIR
-	mb_docdir=$DOC_DIR
-	mb_libexecdir=$LIBEXEC_DIR
+	mb_bindir=$BINDIR
+	mb_libdir=$LIBDIR
+	mb_includedir=$INCLUDEDIR
+	mb_syslibdir=$LIBDIR
+	mb_mandir=$MANDIR
+	mb_docdir=$DOCDIR
+	mb_libexecdir=$LIBEXECDIR
 
 
 	# build
diff --git a/project/defs.mk b/project/defs.mk
index 9ca0cf8..537fa32 100644
--- a/project/defs.mk
+++ b/project/defs.mk
@@ -14,14 +14,14 @@ APP_OBJS 	= $(APP_SRCS:.c=.o)
 SHARED_OBJS 	= $(COMMON_LOBJS) $(ARCH_LOBJS)
 STATIC_OBJS 	= $(COMMON_OBJS)  $(ARCH_OBJS)
 
-SHARED_LIB 	= $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)
-STATIC_LIB 	= $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT)
-SHARED_IMPLIB 	= $(LIB_DIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT)
-
-APP 		= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX)
-DEFAULT_APP 	= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX)
-SHARED_APP 	= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX)
-STATIC_APP 	= $(BIN_DIR)/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX)
+SHARED_LIB 	= $(LIBDIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)
+STATIC_LIB 	= $(LIBDIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT)
+SHARED_IMPLIB 	= $(LIBDIR)/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT)
+
+APP 		= $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)$(OS_APP_SUFFIX)
+DEFAULT_APP 	= $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-default$(OS_APP_SUFFIX)
+SHARED_APP 	= $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-shared$(OS_APP_SUFFIX)
+STATIC_APP 	= $(BINDIR)/$(OS_APP_PREFIX)$(PACKAGE)-static$(OS_APP_SUFFIX)
 
 CFLAGS		= $(CFLAGS_DEBUG)  $(CFLAGS_CONFIG)  $(CFLAGS_SYSROOT) \
 		   $(CFLAGS_COMMON) $(CFLAGS_CMDLINE) $(CFLAGS_HOST) 	\
diff --git a/sysinfo/os/midipix.mk b/sysinfo/os/midipix.mk
index ef2ea71..fded25e 100644
--- a/sysinfo/os/midipix.mk
+++ b/sysinfo/os/midipix.mk
@@ -10,5 +10,5 @@ OS_ARCHIVE_EXT 	= .a
 LDFLAGS_CONFIG	+= -mout-implib
 
 install-implib: shared-implib
-		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
-		cp $(SHARED_IMPLIB) $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
+		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
+		cp $(SHARED_IMPLIB) $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
diff --git a/sysinfo/os/mingw.mk b/sysinfo/os/mingw.mk
index ae0005a..75aba53 100644
--- a/sysinfo/os/mingw.mk
+++ b/sysinfo/os/mingw.mk
@@ -11,5 +11,5 @@ CFLAGS_PIC 	=
 LDFLAGS_CONFIG	+= -Wl,--out-implib,$(SHARED_IMPLIB)
 
 install-implib:	shared-implib
-		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
-		cp $(SHARED_IMPLIB) $(DESTDIR)/./$(PREFIX)/./$(LIB_DIR)
+		mkdir -p $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)
+		cp $(SHARED_IMPLIB) $(DESTDIR)/./$(PREFIX)/./$(LIBDIR)