diff --git a/common.make b/common.make
index cd694f87..1659aac7 100644
--- a/common.make
+++ b/common.make
@@ -177,22 +177,18 @@ GNUSTEP_SYSTEM_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
 GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
 
 ifeq ($(GNUSTEP_FLATTENED),)
-  GNUSTEP_SYSTEM_TARGET_LIBRARIES = \
-	$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-  GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
   GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = \
         $(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
 
-  GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_LIBRARIES) \
-                                   -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
+  GNUSTEP_SYSTEM_LIBRARIES_FLAGS = \
+    -L$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR) \
+    -L$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
 
 else
-  GNUSTEP_SYSTEM_TARGET_LIBRARIES = $(GNUSTEP_SYSTEM_LIBRARIES_ROOT)
-  GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
   GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = \
         $(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)
 
-  GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_LIBRARIES)
+  GNUSTEP_SYSTEM_LIBRARIES_FLAGS = -L$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)
 endif
 
   GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_FLAGS = \
@@ -210,22 +206,17 @@ ifneq ($(GNUSTEP_LOCAL_ROOT),)
   GNUSTEP_LOCAL_FRAMEWORKS_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Library/Headers
 
   ifeq ($(GNUSTEP_FLATTENED),)
-    GNUSTEP_LOCAL_TARGET_LIBRARIES = \
-	$(GNUSTEP_LOCAL_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-    GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
     GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
 
-    GNUSTEP_LOCAL_LIBRARIES_FLAGS = -L$(GNUSTEP_LOCAL_LIBRARIES) \
-                                    -L$(GNUSTEP_LOCAL_TARGET_LIBRARIES)
+    GNUSTEP_LOCAL_LIBRARIES_FLAGS = \
+      -L$(GNUSTEP_LOCAL_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR) \
+      -L$(GNUSTEP_LOCAL_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
   else
-    GNUSTEP_LOCAL_TARGET_LIBRARIES = $(GNUSTEP_LOCAL_LIBRARIES_ROOT)
-    GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)
     GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)
 
-    GNUSTEP_LOCAL_LIBRARIES_FLAGS = -L$(GNUSTEP_LOCAL_LIBRARIES) \
-                                    -L$(GNUSTEP_LOCAL_TARGET_LIBRARIES)
+    GNUSTEP_LOCAL_LIBRARIES_FLAGS = -L$(GNUSTEP_LOCAL_LIBRARIES_ROOT)
   endif
 
   GNUSTEP_LOCAL_HEADERS_FLAGS = -I$(GNUSTEP_LOCAL_HEADERS)
@@ -245,21 +236,16 @@ ifneq ($(GNUSTEP_USER_ROOT),)
 	= $(GNUSTEP_USER_ROOT)/Library/Headers
 
   ifeq ($(GNUSTEP_FLATTENED),)
-    GNUSTEP_USER_TARGET_LIBRARIES = \
-	$(GNUSTEP_USER_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-    GNUSTEP_USER_LIBRARIES \
-	= $(GNUSTEP_USER_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
     GNUSTEP_USER_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
-    GNUSTEP_USER_LIBRARIES_FLAGS   = -L$(GNUSTEP_USER_LIBRARIES) \
-                                     -L$(GNUSTEP_USER_TARGET_LIBRARIES)
+
+    GNUSTEP_USER_LIBRARIES_FLAGS   = \
+      -L$(GNUSTEP_USER_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR) \
+      -L$(GNUSTEP_USER_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
   else
-    GNUSTEP_USER_TARGET_LIBRARIES = $(GNUSTEP_USER_LIBRARIES_ROOT)
-    GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_TARGET_LIBRARIES)
     GNUSTEP_USER_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)
-    GNUSTEP_USER_LIBRARIES_FLAGS   = -L$(GNUSTEP_USER_LIBRARIES) \
-                                     -L$(GNUSTEP_USER_TARGET_LIBRARIES)
+    GNUSTEP_USER_LIBRARIES_FLAGS   = -L$(GNUSTEP_USER_LIBRARIES_ROOT)
   endif
 
   GNUSTEP_USER_HEADERS_FLAGS     = -I$(GNUSTEP_USER_HEADERS)
@@ -278,19 +264,15 @@ ifneq ($(GNUSTEP_NETWORK_ROOT),)
   GNUSTEP_NETWORK_FRAMEWORKS_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Library/Headers
 
   ifeq ($(GNUSTEP_FLATTENED),)
-    GNUSTEP_NETWORK_TARGET_LIBRARIES = \
-	$(GNUSTEP_NETWORK_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
-    GNUSTEP_NETWORK_LIBRARIES \
-	= $(GNUSTEP_NETWORK_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
-    GNUSTEP_NETWORK_LIBRARIES_FLAGS = -L$(GNUSTEP_NETWORK_LIBRARIES) \
-                                      -L$(GNUSTEP_NETWORK_TARGET_LIBRARIES)
+    GNUSTEP_NETWORK_LIBRARIES_FLAGS = \
+      -L$(GNUSTEP_NETWORK_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR) \
+      -L$(GNUSTEP_NETWORK_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
+
     GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_LDIR)
   else
-    GNUSTEP_NETWORK_TARGET_LIBRARIES = $(GNUSTEP_NETWORK_LIBRARIES_ROOT)
-    GNUSTEP_NETWORK_LIBRARIES = $(GNUSTEP_NETWORK_TARGET_LIBRARIES)
-    GNUSTEP_NETWORK_LIBRARIES_FLAGS = -L$(GNUSTEP_NETWORK_LIBRARIES) \
-                                      -L$(GNUSTEP_NETWORK_TARGET_LIBRARIES)
+    GNUSTEP_NETWORK_LIBRARIES_FLAGS = -L$(GNUSTEP_NETWORK_LIBRARIES_ROOT)
+
     GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES = \
 	$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)
   endif