From d71b38bfc4465763a7a676afb5b1e4eccbf81219 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 31 May 2019 16:50:09 +0200
Subject: [PATCH] - use more $(CD) variable

---
 make/neutrino-plugins.mk |  2 +-
 make/neutrino.mk         |  4 ++--
 make/ni.mk               |  4 ++--
 make/rootfs.mk           | 42 ++++++++++++++++++++--------------------
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index fce1aba6..3756204e 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -47,7 +47,7 @@ endif
 $(NP_OBJ_DIR)/config.status: $(NP_DEPS)
 	test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR)
 	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/autogen.sh
-	pushd $(NP_OBJ_DIR) && \
+	$(CD) $(NP_OBJ_DIR); \
 		$(BUILDENV) \
 		$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/configure \
 			--host=$(TARGET) \
diff --git a/make/neutrino.mk b/make/neutrino.mk
index afea169a..893228ec 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -137,7 +137,7 @@ $(N_OBJ_DIR)/config.status: $(N_DEPS)
 	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		git checkout $(NI_NEUTRINO_BRANCH)
 	$(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh
-	pushd $(N_OBJ_DIR) && \
+	$(CD) $(N_OBJ_DIR); \
 		$(N_BUILDENV) \
 		$(SOURCE_DIR)/$(NI_NEUTRINO)/configure \
 			--host=$(TARGET) \
@@ -210,7 +210,7 @@ endif
 $(LH_OBJ_DIR)/config.status: $(LH_DEPS)
 	test -d $(LH_OBJ_DIR) || mkdir -p $(LH_OBJ_DIR)
 	$(SOURCE_DIR)/$(NI_LIBSTB-HAL)/autogen.sh
-	pushd $(LH_OBJ_DIR) && \
+	$(CD) $(LH_OBJ_DIR); \
 		$(N_BUILDENV) \
 		$(SOURCE_DIR)/$(NI_LIBSTB-HAL)/configure \
 			--host=$(TARGET) \
diff --git a/make/ni.mk b/make/ni.mk
index 1b50ce87..67832be3 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -99,9 +99,9 @@ endef
 
 changelogs:
 	$(call make-changelog) > $(STAGING_DIR)/changelog-buildsystem
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO); \
+	$(CD) $(SOURCE_DIR)/$(NI_NEUTRINO); \
 		$(call make-changelog) > $(STAGING_DIR)/changelog-neutrino
-	pushd $(SOURCE_DIR)/$(NI_LIBSTB-HAL); \
+	$(CD) $(SOURCE_DIR)/$(NI_LIBSTB-HAL); \
 		$(call make-changelog) > $(STAGING_DIR)/changelog-libstb-hal
 
 # -----------------------------------------------------------------------------
diff --git a/make/rootfs.mk b/make/rootfs.mk
index 15bb61ff..dea2ea94 100644
--- a/make/rootfs.mk
+++ b/make/rootfs.mk
@@ -117,41 +117,41 @@ endif
 
 # create softlinks in root filesystem
 rootfs-softlinks: $(ROOTFS)
-	pushd $(ROOTFS) && \
+	$(CD) $(ROOTFS); \
 		ln -sf /var/root root
 ifeq ($(BOXSERIES), hd51)
-	pushd $(ROOTFS) && \
+	$(CD) $(ROOTFS); \
 		ln -sf /var/root home
 endif
-	pushd $(ROOTFS)/usr && \
+	$(CD) $(ROOTFS)/usr; \
 		ln -sf /share share
-	pushd $(ROOTFS)/var && \
+	$(CD) $(ROOTFS)/var; \
 		ln -sf /tmp run && \
 		ln -sf /tmp tmp
-	pushd $(ROOTFS)/etc && \
+	$(CD) $(ROOTFS)/etc; \
 		ln -sf /proc/mounts mtab
-	pushd $(ROOTFS)/etc/init.d && \
-		ln -sf fstab K99fstab && \
-		ln -sf fstab S01fstab && \
-		ln -sf syslogd K98syslogd && \
-		ln -sf crond S55crond && \
-		ln -sf crond K55crond && \
-		ln -sf inetd S53inetd && \
+	$(CD) $(ROOTFS)/etc/init.d; \
+		ln -sf fstab K99fstab; \
+		ln -sf fstab S01fstab; \
+		ln -sf syslogd K98syslogd; \
+		ln -sf crond S55crond; \
+		ln -sf crond K55crond; \
+		ln -sf inetd S53inetd; \
 		ln -sf inetd K80inetd
 ifeq ($(BOXSERIES), hd2)
-	pushd $(ROOTFS)/etc && \
-		ln -sf /var/etc/exports exports && \
-		ln -sf /var/etc/fstab fstab && \
-		ln -sf /var/etc/hostname hostname && \
-		ln -sf /var/etc/localtime localtime && \
-		ln -sf /var/etc/passwd passwd && \
-		ln -sf /var/etc/resolv.conf resolv.conf && \
+	$(CD) $(ROOTFS)/etc; \
+		ln -sf /var/etc/exports exports; \
+		ln -sf /var/etc/fstab fstab; \
+		ln -sf /var/etc/hostname hostname; \
+		ln -sf /var/etc/localtime localtime; \
+		ln -sf /var/etc/passwd passwd; \
+		ln -sf /var/etc/resolv.conf resolv.conf; \
 		ln -sf /var/etc/wpa_supplicant.conf wpa_supplicant.conf
-	pushd $(ROOTFS)/etc/network && \
+	$(CD) $(ROOTFS)/etc/network; \
 		ln -sf /var/etc/network/interfaces interfaces
 endif
 	mkdir -p $(ROOTFS)/var/tuxbox/config
-	pushd $(ROOTFS)/var/tuxbox/config && \
+	$(CD) $(ROOTFS)/var/tuxbox/config; \
 		ln -sf /var/keys/SoftCam.Key SoftCam.Key
 
 # -----------------------------------------------------------------------------