Changeset d419478 in freewrt for package/net-snmp

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/net-snmp/Makefile (modified) (7 diffs)

package/net-snmp/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=@SF/net-snmp
 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
+
 
 SNMP_MIB_MODULES_INCLUDED = \
@@ -101 +98 @@
 $(eval $(call PKG_template,SNMP_UTILS,snmp-utils,$(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)" \
@@ -132 +129 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+$(WRKBUILD)/.built:
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
+                INSTALL_PREFIX="$(WRKINST)" \
                 all install
-        ( cd $(PKG_INSTALL_DIR); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-shared; )
+        ( cd $(WRKINST); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-shared; )
 ifneq ($(BR2_PACKAGE_SNMPD_STATIC),)
-        ( cd $(PKG_BUILD_DIR); rm -f agent/snmpd; )
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+        ( cd $(WRKBUILD); rm -f agent/snmpd; )
+        $(MAKE) -C $(WRKBUILD) \
                 LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -static" \
-                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
+                INSTALL_PREFIX="$(WRKINST)" \
                 all install
-        ( cd $(PKG_INSTALL_DIR); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-static; )
+        ( cd $(WRKINST); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-static; )
 endif
         touch $@
@@ -151 +148 @@
 $(IPKG_LIBNETSNMP):
         install -d -m0755 $(IDIR_LIBNETSNMP)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/
         $(RSTRIP) $(IDIR_LIBNETSNMP)
         $(IPKG_BUILD) $(IDIR_LIBNETSNMP) $(PACKAGE_DIR)
@@ -163 +160 @@
         install -m0755 ./files/snmpd.init $(IDIR_SNMPD)/etc/init.d/snmpd
         install -d -m0755 $(IDIR_SNMPD)/usr/sbin
-        install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/snmpd-shared $(IDIR_SNMPD)/usr/sbin/snmpd
+        install -m0755 $(WRKINST)/usr/sbin/snmpd-shared $(IDIR_SNMPD)/usr/sbin/snmpd
         $(RSTRIP) $(IDIR_SNMPD)
         $(IPKG_BUILD) $(IDIR_SNMPD) $(PACKAGE_DIR)
@@ -175 +172 @@
         install -m0755 ./files/snmpd.init $(IDIR_SNMPD_STATIC)/etc/init.d/snmpd
         install -d -m0755 $(IDIR_SNMPD_STATIC)/usr/sbin
-        install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/snmpd-static $(IDIR_SNMPD_STATIC)/usr/sbin/snmpd
+        install -m0755 $(WRKINST)/usr/sbin/snmpd-static $(IDIR_SNMPD_STATIC)/usr/sbin/snmpd
         $(RSTRIP) $(IDIR_SNMPD_STATIC)
         $(IPKG_BUILD) $(IDIR_SNMPD_STATIC) $(PACKAGE_DIR)
@@ -181 +178 @@
 $(IPKG_SNMP_UTILS):
         install -d -m0755 $(IDIR_SNMP_UTILS)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/
         $(RSTRIP) $(IDIR_SNMP_UTILS)
         $(IPKG_BUILD) $(IDIR_SNMP_UTILS) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libnetsnmp.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libnetsnmp.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/net-snmp $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/
         touch $@