diff --git a/Makefile b/Makefile
index bb8a2835dc53a8279557f6739fca99aa7716ccb5..d4f40819fba5463d767d69e4c1c0bb9667192aee 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ OUTPUT_TYPE = DEVICE
 #	- $HOME/DeviceServers if OUTPUT_TYPE is DEVICE
 #	- ../bin for others
 #
-OUTPUT_DIR = ./bin/$(BIN_DIR)
+#OUTPUT_DIR = ./bin/$(BIN_DIR)
 
 
 #
@@ -82,7 +82,7 @@ INC_DIR_USER= -I . -I$(GPIB_DIR)
 #   - for a device server, tango libraries directories are automatically appended
 #   - '-L ../lib' is automatically appended in all cases
 #
-LIB_DIR_USER=
+LIB_DIR_USER= -L $(GPIB_DIR)/$(_libdir) -L $(TANGO_HOME)/$(_libdir)
 
 #=============================================================================
 # LFLAGS_USR is the list of user link flags
@@ -95,7 +95,7 @@ LIB_DIR_USER=
 # you must use '-lA -lB' in this order as link flags, otherwise you will get
 # 'undefined reference' errors
 #
-LFLAGS_USR+=  $(GPIB_DIR)/bin/libGpibDeviceServer.a  $(TANGO_HOME)/$(_libdir)/libgpib.a
+LFLAGS_USR+=  -lGpibDeviceServer  -lgpib
 
 
 #=============================================================================