Changeset d419478 in freewrt for package/mksh/Makefile

Timestamp:

Jul 21, 2006, 1:56:32 AM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

50d34d3

Parents:

2029b2e

Message:

• whitespace cleanup, while here
• move WRKDIR and DISTFILES definition into PKG_template
• define WRKDIR via parent BUILD_DIR instead of going up from WRKSRC
• use a sub-directory as WRKDIR, like BSD
• rename PKG_BUILD_DIR into WRKBUILD
• define WRKBUILD relative via WRKDIR
• rename PKG_INSTALL_DIR into WRKINST
• fix a few dependencies
• make use of common cases in the definition of WRKBUILD and WRKINST, removing many redundant lines
• use WRKDIR instead of BUILD_DIR in places where the latter was used previously
• while here, remove PKG_CAT stuff

this only affects packages, for now

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@303 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/mksh/Makefile (modified) (4 diffs)

package/mksh/Makefile

@@ -11 +11 @@
 PKG_SOURCE_URL=         http://mirbsd.mirsolutions.de/MirOS/dist/mir/mksh/ \
                         http://miros.unixforge.de/MirOS/dist/mir/mksh/
-PKG_CAT=                uncgz
-PKG_BUILD_DIR=          $(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL_DIR=        $(PKG_BUILD_DIR)/ipkg-install
+WRKBUILD=               ${WRKDIR}/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
@@ -19 +17 @@
 $(eval $(call PKG_template,MKSH,mksh,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         @touch $@
 
@@ -26 +24 @@
                         -D_FILE_OFFSET_BITS=64 -DNEED_COMPAT
 
-$(PKG_BUILD_DIR)/.built:
-        (cd ${PKG_BUILD_DIR}; \
+$(WRKBUILD)/.built:
+        (cd ${WRKBUILD}; \
             CC='${TARGET_CC}' \
             CFLAGS='${TARGET_CFLAGS}' \
@@ -34 +32 @@
             SRCS='compat.c' \
             sh Build.sh -d -r -q -x)
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)/bin
-        install -c -m 755 ${PKG_BUILD_DIR}/mksh ${PKG_INSTALL_DIR}/bin/mksh
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)/bin
+        install -c -m 755 ${WRKBUILD}/mksh ${WRKINST}/bin/mksh
         @touch $@
 
 $(IPKG_MKSH):
         install -d -m 0755 $(IDIR_MKSH)/bin
-        $(CP) $(PKG_INSTALL_DIR)/bin/mksh $(IDIR_MKSH)/bin/
+        $(CP) $(WRKINST)/bin/mksh $(IDIR_MKSH)/bin/
         $(RSTRIP) $(IDIR_MKSH)
         $(IPKG_BUILD) $(IDIR_MKSH) $(PACKAGE_DIR)