Changeset d419478 in freewrt for package/rrdtool1

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/rrdtool1/Makefile (modified) (6 diffs)

package/rrdtool1/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+WRKBUILD:=${WRKDIR}/rrdtool-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
@@ -21 +19 @@
 $(eval $(call PKG_template,RRDTOOL1,rrdtool1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); rm -rf config.{status,cache} ; \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); rm -rf config.{status,cache} ; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -58 +56 @@
         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)" \
                 shrext_cmds=".so" \
                 all install
@@ -69 +67 @@
 $(IPKG_RRDTOOL1):
         install -d -m0755 $(IDIR_RRDTOOL1)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/
         $(RSTRIP) $(IDIR_RRDTOOL1)
         $(IPKG_BUILD) $(IDIR_RRDTOOL1) $(PACKAGE_DIR)
@@ -76 +74 @@
 $(IPKG_RRDCGI1):
         install -d -m0755 $(IDIR_RRDCGI1)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/
         $(RSTRIP) $(IDIR_RRDCGI1)
         $(IPKG_BUILD) $(IDIR_RRDCGI1) $(PACKAGE_DIR)
@@ -82 +80 @@
 $(IPKG_LIBRRD1):
         install -d -m0755 $(IDIR_LIBRRD1)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/
         $(RSTRIP) $(IDIR_LIBRRD1)
         $(IPKG_BUILD) $(IDIR_LIBRRD1) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/librrd.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
         touch $@