From 43c06e94319d29d8d1156c07c16c9d3be4b25588 Mon Sep 17 00:00:00 2001 From: "Michael I. Bushnell" Date: Wed, 28 Jun 1995 20:22:55 +0000 Subject: (HURDLIBS-libs, HURDLIBS-files): Fix; don't use buggy patsubst. --- Makeconf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Makeconf') 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) -- cgit v1.2.3