Changeset d419478 in freewrt for package/fuse

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/fuse/Makefile (modified) (5 diffs)

package/fuse/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 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
 
 include $(TOPDIR)/package/rules.mk
@@ -20 +17 @@
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
-        (cd $(PKG_BUILD_DIR); \
+$(WRKBUILD)/.configured:
+        (cd $(WRKBUILD); \
                 rm -rf config.{cache,status} ; \
                 touch configure.in ; \
@@ -63 +60 @@
         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)" \
                 all install
         touch $@
@@ -73 +70 @@
 $(IPKG_LIBFUSE):
         mkdir -p $(IDIR_LIBFUSE)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/
         $(RSTRIP) $(IDIR_LIBFUSE)
         $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR)
@@ -79 +76 @@
 $(IPKG_FUSE_UTILS):
         mkdir -p $(IDIR_FUSE_UTILS)/usr/bin
-        $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
+        $(CP) $(WRKINST)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/
         $(RSTRIP) $(IDIR_FUSE_UTILS)
         $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR)
 
-$(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built
+$(STAGING_DIR)/usr/lib/libfuse.so: $(WRKBUILD)/.built
         mkdir -p $(STAGING_DIR)/usr/include
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/
-        $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/fuse $(STAGING_DIR)/usr/include/
+        $(CP) $(WRKINST)/usr/include/fuse.h $(STAGING_DIR)/usr/include/
         mkdir -p $(STAGING_DIR)/usr/lib
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/
+        $(CP) $(WRKINST)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/
         mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+        $(CP) $(WRKINST)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/
         $(SED) 's,-I$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc
         $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc