From 0acaf5127ede7fc0eac16c950e4a450e76962ff9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 14 May 2014 06:56:43 +0200
Subject: further simplify through substitution references

---
 Makefile.common            | 2 +-
 Makefile.config            | 6 +++---
 mdk-stage1/Makefile        | 6 +++---
 mdk-stage1/Makefile.common | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 596723c43..11aa0414b 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -15,7 +15,7 @@
  #*****************************************************************************
 
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst sparc%,sparc,$(ARCH))
+ARCH := $(ARCH:sparc%=sparc)
 
  #- default lib is glibc (honoured by main Makefile whenever possible)
 L = GLIBC
diff --git a/Makefile.config b/Makefile.config
index ae1d66555..dabf65a5b 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -8,10 +8,10 @@ DISTRIB_DESCR = "$(_DISTRIB_NAME) release $(DISTRIB_VERSION)"
 
 # not config, but useful everywhere :)
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst sparc%,sparc,$(ARCH))
-ARCH := $(patsubst arm%,arm,$(ARCH))
+ARCH := $(ARCH:sparc%=sparc)
+ARCH := $(ARCH:arm%=arm)
 
-PKG_ARCH := $(patsubst i386,i586,$(ARCH))
+PKG_ARCH := $(ARCH:i386=i586)
 
 ifeq (x86_64, $(ARCH))
 LIB = lib64
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index b170b73d3..381b4b172 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -42,7 +42,7 @@ INIT_DEFS += $(GLIBC_INCLUDES)
 
 STAGE1_DEFS=-DDISABLE_KA
 
-INITOBJS = $(subst .c,.o,$(INITSRC))
+INITOBJS = $(INITSRC:.c=.o)
 
 
  #- frontends
@@ -52,7 +52,7 @@ NEWT_FRONTEND_LIBS = -lnewt -lslang
 STDIO_FRONTEND_SRC = stdio-frontend.c
 STDIO_FRONTEND_LIBS =
 
-FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC))
+FRONTEND_OBJS = $($(F)_FRONTEND_SRC:.c=.o)
 
 FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS)
 
@@ -87,7 +87,7 @@ STAGE1OBJS-NETWORK-STANDALONE = $(subst .c,-NETWORK-STANDALONE.o,$(STAGE1SRC) $(
 NETWORK_STANDALONE_DEFS = -DDISABLE_CDROM -DDISABLE_DISK -DENABLE_NETWORK_STANDALONE -DDISABLE_KA
 
 
-STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1_ALLSRC))
+STAGE1OBJS-FULL = $(STAGE1_ALLSRC:.c=-FULL.o)
 
 BINS = init stage1 dhcp-client rescue-gui probe-modules
 
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index 2d344a866..36fa34d49 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -15,7 +15,7 @@
  #*****************************************************************************
 
 ARCH := $(patsubst i%86,i386,$(shell uname -m))
-ARCH := $(patsubst arm%,arm,$(ARCH))
+ARCH := $(ARCH:arm%=arm)
 
 # DEBUG = 1
 
-- 
cgit v1.2.1