Changeset d419478 in freewrt for package/mini_httpd

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/mini_httpd/Makefile (modified) (8 diffs)

package/mini_httpd/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.acme.com/software/mini_httpd/
 PKG_SOURCE:=mini_httpd-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/mini_httpd-$(PKG_VERSION)
+WRKBUILD:=${WRKDIR}/mini_httpd-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
@@ -22 +21 @@
 
 
-$(PKG_BUILD_DIR)/.configured:
-        $(CP) ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/
+$(WRKBUILD)/.configured:
+        $(CP) ./files/matrixssl_helper.{c,h} $(WRKBUILD)/
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
+$(WRKBUILD)/.built:
         # with MatrixSSL
 ifneq ($(BR2_PACKAGE_MINI_HTTPD_MATRIXSSL),)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+        $(MAKE) -C $(WRKBUILD) \
                 CC=$(TARGET_CC) \
                 OFLAGS="$(TARGET_CFLAGS)" \
@@ -37 +36 @@
                 SSL_OBJS="matrixssl_helper.o" \
                 all
-        (cd $(PKG_BUILD_DIR); mv mini_httpd mini_httpd-matrixssl; )
-        $(MAKE) -C $(PKG_BUILD_DIR) clean
+        (cd $(WRKBUILD); mv mini_httpd mini_httpd-matrixssl; )
+        $(MAKE) -C $(WRKBUILD) clean
 endif
         # with OpenSSL
 ifneq ($(BR2_PACKAGE_MINI_HTTPD_OPENSSL),)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+        $(MAKE) -C $(WRKBUILD) \
                 CC=$(TARGET_CC) \
                 OFLAGS="$(TARGET_CFLAGS)" \
@@ -49 +48 @@
                 SSL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto" \
                 all
-        (cd $(PKG_BUILD_DIR); mv mini_httpd mini_httpd-openssl; )
-        $(MAKE) -C $(PKG_BUILD_DIR) clean
+        (cd $(WRKBUILD); mv mini_httpd mini_httpd-openssl; )
+        $(MAKE) -C $(WRKBUILD) clean
 endif
         # without SSL
 ifneq ($(BR2_PACKAGE_MINI_HTTPD),)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+        $(MAKE) -C $(WRKBUILD) \
                 CC=$(TARGET_CC) \
                 OFLAGS="$(TARGET_CFLAGS)" \
@@ -69 +68 @@
         install -m0755 ./files/mini_httpd.init $(IDIR_MINI_HTTPD)/etc/init.d/mini_httpd
         install -d -m0755 $(IDIR_MINI_HTTPD)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/mini_httpd $(IDIR_MINI_HTTPD)/usr/sbin/
+        install -m0755 $(WRKBUILD)/mini_httpd $(IDIR_MINI_HTTPD)/usr/sbin/
         $(RSTRIP) $(IDIR_MINI_HTTPD)
         $(IPKG_BUILD) $(IDIR_MINI_HTTPD) $(PACKAGE_DIR)
@@ -75 +74 @@
 $(IPKG_MINI_HTTPD_HTPASSWD):
         install -d -m0755 $(IDIR_MINI_HTTPD_HTPASSWD)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/htpasswd $(IDIR_MINI_HTTPD_HTPASSWD)/usr/sbin/
+        install -m0755 $(WRKBUILD)/htpasswd $(IDIR_MINI_HTTPD_HTPASSWD)/usr/sbin/
         $(RSTRIP) $(IDIR_MINI_HTTPD_HTPASSWD)
         $(IPKG_BUILD) $(IDIR_MINI_HTTPD_HTPASSWD) $(PACKAGE_DIR)
@@ -88 +87 @@
         install -m0755 ./files/mini_httpd.init $(IDIR_MINI_HTTPD_MATRIXSSL)/etc/init.d/mini_httpd
         install -d -m0755 $(IDIR_MINI_HTTPD_MATRIXSSL)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/mini_httpd-matrixssl $(IDIR_MINI_HTTPD_MATRIXSSL)/usr/sbin/mini_httpd
+        install -m0755 $(WRKBUILD)/mini_httpd-matrixssl $(IDIR_MINI_HTTPD_MATRIXSSL)/usr/sbin/mini_httpd
         $(RSTRIP) $(IDIR_MINI_HTTPD_MATRIXSSL)
         $(IPKG_BUILD) $(IDIR_MINI_HTTPD_MATRIXSSL) $(PACKAGE_DIR)
@@ -101 +100 @@
         install -m0755 ./files/mini_httpd.init $(IDIR_MINI_HTTPD_OPENSSL)/etc/init.d/mini_httpd
         install -d -m0755 $(IDIR_MINI_HTTPD_OPENSSL)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/mini_httpd-openssl $(IDIR_MINI_HTTPD_OPENSSL)/usr/sbin/mini_httpd
+        install -m0755 $(WRKBUILD)/mini_httpd-openssl $(IDIR_MINI_HTTPD_OPENSSL)/usr/sbin/mini_httpd
         $(RSTRIP) $(IDIR_MINI_HTTPD_OPENSSL)
         $(IPKG_BUILD) $(IDIR_MINI_HTTPD_OPENSSL) $(PACKAGE_DIR)