Changeset d419478 in freewrt for package/howl

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

package/howl/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.porchdogsoft.com/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -23 +20 @@
 $(eval $(call PKG_template,NIFD,nifd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -54 +51 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+$(WRKBUILD)/.built:
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
+                DESTDIR="$(WRKINST)" \
                 all install
         touch $@
@@ -64 +61 @@
 $(IPKG_LIBHOWL):
         install -m0755 -d $(IDIR_LIBHOWL)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.so.* $(IDIR_LIBHOWL)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/lib{howl,mDNSResponder}.so.* $(IDIR_LIBHOWL)/usr/lib/
         $(RSTRIP) $(IDIR_LIBHOWL)
         $(IPKG_BUILD) $(IDIR_LIBHOWL) $(PACKAGE_DIR)
@@ -70 +67 @@
 $(IPKG_HOWL_UTILS):
         install -m0755 -d $(IDIR_HOWL_UTILS)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(IDIR_HOWL_UTILS)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(IDIR_HOWL_UTILS)/usr/bin/
         $(RSTRIP) $(IDIR_HOWL_UTILS)
         $(IPKG_BUILD) $(IDIR_HOWL_UTILS) $(PACKAGE_DIR)
@@ -80 +77 @@
         install -m0644 ./files/mDNSResponder.init $(IDIR_MDNSRESPONDER)/etc/init.d/mDNSResponder
         install -m0755 -d $(IDIR_MDNSRESPONDER)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(IDIR_MDNSRESPONDER)/usr/sbin/
+        $(CP) $(WRKINST)/usr/bin/mDNSResponder $(IDIR_MDNSRESPONDER)/usr/sbin/
         $(RSTRIP) $(IDIR_MDNSRESPONDER)
         $(IPKG_BUILD) $(IDIR_MDNSRESPONDER) $(PACKAGE_DIR)
@@ -88 +85 @@
         install -m0644 ./files/autoipd.init $(IDIR_AUTOIPD)/etc/init.d/autoipd
         install -m0755 -d $(IDIR_AUTOIPD)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(IDIR_AUTOIPD)/usr/sbin/
+        $(CP) $(WRKINST)/usr/bin/autoipd $(IDIR_AUTOIPD)/usr/sbin/
         $(RSTRIP) $(IDIR_AUTOIPD)
         $(IPKG_BUILD) $(IDIR_AUTOIPD) $(PACKAGE_DIR)
@@ -96 +93 @@
         install -m0644 ./files/nifd.init $(IDIR_NIFD)/etc/init.d/nifd
         install -m0755 -d $(IDIR_NIFD)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/nifd $(IDIR_NIFD)/usr/sbin/
+        $(CP) $(WRKINST)/usr/bin/nifd $(IDIR_NIFD)/usr/sbin/
         $(RSTRIP) $(IDIR_NIFD)
         $(IPKG_BUILD) $(IDIR_NIFD) $(PACKAGE_DIR)
         
-$(STAGING_DIR)/usr/lib/libhowl.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libhowl.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/howl $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/
         mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+        $(CP) $(WRKINST)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/
         touch $(STAGING_DIR)/usr/lib/libhowl.so