(HURDLIBS-libs, HURDLIBS-files): Fix; don't use buggy patsubst.

1 files changed, 3 insertions, 5 deletions

diff --git a/Makeconf b/Makeconf
index 3e2a935a..2049f752 100644
--- a/Makeconf
+++ b/Makeconf
@@ -151,13 +151,11 @@ LDFLAGS += -static
 # a variable above with the complete file name to find it.
 # Yippee!  A use for computed variable references!
 ifeq ($(filter-out -static,$(LDFLAGS)),$(LDFLAGS))
-HURDLIBS-files := $(patsubst lib%,../lib%/lib%.so,$(HURDLIBS))
+HURDLIBS-files := $(foreach lib,$(HURDLIBS), ../$(lib)/$(lib).a)
 else
-HURDLIBS-files := $(patsubst lib%,../lib%/lib%.a,$(HURDLIBS))
+HURDLIBS-files := $(foreach lib,$(HURDLIBS), ../$(lib)/$(lib).so)
 endif
-HURDLIBS-libs := $(foreach lib,$(HURDLIBS-files), \
-			   -L$(dir $(lib)) \
-			   $(patsubst lib%.a,-l%,$(notdir $(lib))))
+HURDLIBS-libs := $(foreach lib,$(HURDLIBS), -L../$(lib) -l$(lib))
 
 # Building the target
 ifeq ($(doinst),one)