ifneq ($(FHS_INSTALL_ROOT),)
FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin
+FHS_LIB_DIR=$(CONFIGURE_FHS_INSTALL_LIBDIR)
NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"