Changeset d419478 in freewrt for package/quagga

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/quagga/Makefile (modified) (10 diffs)

package/quagga/Makefile

@@ -12 +12 @@
                 http://www.uk.quagga.net/download/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-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
@@ -28 +24 @@
 $(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,$(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) -I$(STAGING_DIR)/usr/include" \
@@ -65 +61 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                DESTDIR=$(PKG_INSTALL_DIR) \
+$(WRKBUILD)/.built:
+        $(MAKE) -C $(WRKBUILD) \
+                DESTDIR=$(WRKINST) \
                 all install
         touch $@
@@ -73 +69 @@
 $(IPKG_QUAGGA):
         install -d -m0755 $(IDIR_QUAGGA)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/
         install -d -m0755 $(IDIR_QUAGGA)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/
         # avoid /etc being set to 0750
         install -d -m0755 $(IDIR_QUAGGA)/etc/quagga/
@@ -89 +85 @@
 $(IPKG_QUAGGA_BGPD):
         install -d -m0755 $(IDIR_QUAGGA_BGPD)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/
         $(RSTRIP) $(IDIR_QUAGGA_BGPD)
         $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR)
@@ -95 +91 @@
 $(IPKG_QUAGGA_OSPFD):
         install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/
         install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/
         $(RSTRIP) $(IDIR_QUAGGA_OSPFD)
         $(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR)
@@ -103 +99 @@
 $(IPKG_QUAGGA_OSPF6D):
         install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/
         $(RSTRIP) $(IDIR_QUAGGA_OSPF6D)
         $(IPKG_BUILD) $(IDIR_QUAGGA_OSPF6D) $(PACKAGE_DIR)
@@ -109 +105 @@
 $(IPKG_QUAGGA_RIPD):
         install -d -m0755 $(IDIR_QUAGGA_RIPD)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/
         $(RSTRIP) $(IDIR_QUAGGA_RIPD)
         $(IPKG_BUILD) $(IDIR_QUAGGA_RIPD) $(PACKAGE_DIR)
@@ -115 +111 @@
 $(IPKG_QUAGGA_RIPNGD):
         install -d -m0755 $(IDIR_QUAGGA_RIPNGD)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/
         $(RSTRIP) $(IDIR_QUAGGA_RIPNGD)
         $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(PACKAGE_DIR)
@@ -121 +117 @@
 $(IPKG_QUAGGA_VTYSH):
         install -d -m0755 $(IDIR_QUAGGA_VTYSH)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/
         $(RSTRIP) $(IDIR_QUAGGA_VTYSH)
         $(IPKG_BUILD) $(IDIR_QUAGGA_VTYSH) $(PACKAGE_DIR)