Changeset d419478 in freewrt for package/ppp

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/ppp/Makefile (modified) (9 diffs)

package/ppp/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 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
@@ -21 +18 @@
 $$(IPKG_$(1)):
         install -d -m0755 $$(IDIR_$(1))/usr/lib/pppd/$(PKG_VERSION)
-        install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/$(2).so \
+        install -m0755 $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/$(2).so \
                 $$(IDIR_$(1))/usr/lib/pppd/$(PKG_VERSION)/
         $(RSTRIP) $$(IDIR_$(1))
@@ -45 +42 @@
 endif
 
-$(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)" \
@@ -72 +69 @@
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)/usr
-        $(MAKE) -C $(PKG_BUILD_DIR) \
+$(WRKBUILD)/.built:
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)/usr
+        $(MAKE) -C $(WRKBUILD) \
                 CC=$(TARGET_CC) \
                 COPTS="$(TARGET_CFLAGS)" \
@@ -81 +78 @@
                 $(ENABLE_FILTER) \
                 STAGING_DIR=$(STAGING_DIR) \
-                DESTDIR="$(PKG_INSTALL_DIR)/usr" \
+                DESTDIR="$(WRKINST)/usr" \
                 TARGET_AR='$(TARGET_CROSS)ar' \
                 all install
@@ -101 +98 @@
         install -d -m0755 $(IDIR_PPP)/etc/ppp/ip-down.d
         install -d -m0755 $(IDIR_PPP)/usr/sbin
-        install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/
+        install -m0755 $(WRKINST)/usr/sbin/pppd $(IDIR_PPP)/usr/sbin/
         install -d -m0755 $(IDIR_PPP)/usr/lib/pppd
         echo "Depends: $(PKG_DEPEND)" >> $(IDIR_PPP)/CONTROL/control
@@ -132 +129 @@
 $(IPKG_CHAT):
         install -d -m0755 $(IDIR_CHAT)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/
         $(RSTRIP) $(IDIR_CHAT)
         $(IPKG_BUILD) $(IDIR_CHAT) $(PACKAGE_DIR)
@@ -138 +135 @@
 $(IPKG_PPPDUMP):
         install -d -m0755 $(IDIR_PPPDUMP)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/
         $(RSTRIP) $(IDIR_PPPDUMP)
         $(IPKG_BUILD) $(IDIR_PPPDUMP) $(PACKAGE_DIR)
@@ -144 +141 @@
 $(IPKG_PPPSTATS): $(IPKG_PPP)
         install -d -m0755 $(IDIR_PPPSTATS)/usr/sbin
-        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/
+        $(CP) $(WRKINST)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/
         $(RSTRIP) $(IDIR_PPPSTATS)
         $(IPKG_BUILD) $(IDIR_PPPSTATS) $(PACKAGE_DIR)