Changeset d419478 in freewrt for package/cgilib

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/cgilib/Makefile (modified) (3 diffs)

package/cgilib/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(TOPDIR)/package/rules.mk
@@ -18 +16 @@
 $(eval $(call PKG_template,CGILIB,cgilib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built: $(WRKBUILD)/.configured
+        $(MAKE) -C $(WRKBUILD) \
                 $(TARGET_CONFIGURE_OPTS) \
                 OFLAGS="$(TARGET_CFLAGS)" \
@@ -30 +28 @@
 $(IPKG_CGILIB):
         install -d -m0755 $(IDIR_CGILIB)/usr/lib
-        $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(IDIR_CGILIB)/usr/lib/
+        $(CP) $(WRKBUILD)/libcgi.so.* $(IDIR_CGILIB)/usr/lib/
         $(RSTRIP) $(IDIR_CGILIB)
         $(IPKG_BUILD) $(IDIR_CGILIB) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libcgi.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libcgi.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKBUILD)/cgi.h $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKBUILD)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/
         touch $@