Changeset d419478 in freewrt for package/zlib

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/zlib/Makefile (modified) (4 diffs)

package/zlib/Makefile

@@ -11 +11 @@
         @SF/zlib
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -20 +17 @@
 $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); \
                 $(TARGET_CONFIGURE_OPTS) \
                 LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
@@ -31 +28 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        $(MAKE) -C $(WRKBUILD) \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
                 libz.a libz.so
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
+                DESTDIR="$(WRKINST)" \
                 install
         touch $@
@@ -44 +41 @@
 $(IPKG_ZLIB):
         install -m0755 -d $(IDIR_ZLIB)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
         $(RSTRIP) $(IDIR_ZLIB)
         $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libz.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include
+        $(CP) $(WRKINST)/usr/include/*.h $(STAGING_DIR)/usr/include
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib
+        $(CP) $(WRKINST)/usr/lib/* $(STAGING_DIR)/usr/lib
         touch $(STAGING_DIR)/usr/lib/libz.so