From acf8889663949c2beaa8ab295e144741342d1cd4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbrodkorb@conet.de>
Date: Tue, 6 Jan 2015 14:26:19 +0100
Subject: update mksh to use /etc/mkshrc, as discussed with tg@

---
 package/mksh/Makefile             | 45 ++++++++++++++++++++-------------------
 package/mksh/files/mksh.conffiles |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index e3b63f48f..92191a604 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -1,29 +1,29 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		mksh
 PKG_VERSION:=		50d
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		a2268826a1463959ff7b7979fbf9176f1298400ecc24ae13d6337eee5c63f982
 PKG_DESCR:=		mirbsd korn shell
 PKG_SECTION:=		base/shells
 PKG_URL:=		http://www.mirbsd.org/mksh.htm
-PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+PKG_SITES:=		$(MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/)
 
 PKG_DFLT_MKSH:=		y if (!ADK_TOOLCHAIN_ONLY && !ADK_TARGET_UCLINUX)
 
-DISTFILES:=		${PKG_NAME}-R${PKG_VERSION}.tgz
-WRKDIST=		${WRKDIR}/${PKG_NAME}
+DISTFILES:=		$(PKG_NAME)-R$(PKG_VERSION).tgz
+WRKDIST=		$(WRKDIR)/$(PKG_NAME)
 
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call HOST_template,MKSH,mksh,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,MKSH,mksh,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKG_DESCR),$(PKG_SECTION)))
 
-TARGET_CPPFLAGS+=	-DMKSH_SMALL=1
+TARGET_CPPFLAGS+=	-DMKSH_SMALL=1 -DMKSHRC_PATH=\"/etc/mkshrc\"
 
 HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
@@ -31,23 +31,24 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 host-build:
-	cd ${WRKBUILD} && ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
+	cd $(WRKBUILD) && $(BASH) $(WRKSRC)/Build.sh -Q -r -c lto
 
 mksh-hostinstall:
-	${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/mksh \
-	    ${STAGING_HOST_DIR}/usr/bin/
+	$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/mksh \
+	    $(STAGING_HOST_DIR)/usr/bin
 
 do-build:
-	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
-	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	cd $(WRKBUILD) && CC='$(TARGET_CC)' CFLAGS='$(TARGET_CFLAGS)' \
+	    CPPFLAGS='$(TARGET_CPPFLAGS)' LDFLAGS='$(TARGET_LDFLAGS)' \
 	    HAVE_CAN_FSTACKPROTECTORALL=0 HAVE_CAN_FSTACKPROTECTORSTRONG=0 \
-	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
+	    TARGET_OS=Linux $(BASH) $(WRKSRC)/Build.sh -Q -r -c lto
 
 mksh-install:
-	${INSTALL_DIR} ${IDIR_MKSH}/bin ${IDIR_MKSH}/root
-	${INSTALL_BIN} ${WRKBUILD}/mksh ${IDIR_MKSH}/bin/
-	${CP} ${WRKSRC}/dot.mkshrc ${IDIR_MKSH}/root/.mkshrc
+	$(INSTALL_DIR) $(IDIR_MKSH)/etc
+	$(CP) $(WRKSRC)/dot.mkshrc $(IDIR_MKSH)/etc/mkshrc
+	$(INSTALL_DIR) $(IDIR_MKSH)/bin
+	$(INSTALL_BIN) $(WRKBUILD)/mksh $(IDIR_MKSH)/bin
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/mksh/files/mksh.conffiles b/package/mksh/files/mksh.conffiles
index dec964050..658e5fd31 100644
--- a/package/mksh/files/mksh.conffiles
+++ b/package/mksh/files/mksh.conffiles
@@ -1 +1 @@
-/root/.mkshrc
+/etc/mkshrc
-- 
cgit v1.2.3