Changeset d419478 in freewrt for package/samba/Makefile

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

package/samba/Makefile

@@ -9 +9 @@
         ftp://ftp.easynet.be/samba/stable
 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
@@ -18 +15 @@
 $(eval $(call PKG_template,SAMBA_CLIENT,samba-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
-        rm -rf $(PKG_INSTALL_DIR)
-        mkdir -p $(PKG_INSTALL_DIR)
-        (cd $(PKG_BUILD_DIR)/source ; rm -rf config.{cache,status} ; \
+$(WRKBUILD)/.built:
+        rm -rf $(WRKINST)
+        mkdir -p $(WRKINST)
+        (cd $(WRKBUILD)/source ; rm -rf config.{cache,status} ; \
                 ./configure \
                         --program-prefix="" \
@@ -45 +42 @@
                         --with-privatedir=/etc/samba \
         );
-        $(MAKE) -C $(PKG_BUILD_DIR)/source \
+        $(MAKE) -C $(WRKBUILD)/source \
                 bin/make_smbcodepage bin/make_unicodemap
-        (cd $(PKG_BUILD_DIR)/source/bin ; \
+        (cd $(WRKBUILD)/source/bin ; \
                 mv -f make_smbcodepage make_smbcodepage.old ; \
                 mv -f make_unicodemap make_unicodemap.old ; \
         );
 
-        $(MAKE) -C $(PKG_BUILD_DIR)/source \
+        $(MAKE) -C $(WRKBUILD)/source \
                 clean
 
-        (cd $(PKG_BUILD_DIR)/source; rm -rf config.{cache,status}; \
+        (cd $(WRKBUILD)/source; rm -rf config.{cache,status}; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \
@@ -122 +119 @@
                         --with-syslog \
         );
-        $(MAKE) -C $(PKG_BUILD_DIR)/source \
+        $(MAKE) -C $(WRKBUILD)/source \
                 $(TARGET_CONFIGURE_OPTS) \
                 CODEPAGEDIR="/usr/share/samba" \
                 all shared
-        (cd $(PKG_BUILD_DIR)/source/bin ; \
+        (cd $(WRKBUILD)/source/bin ; \
                 mv -f make_smbcodepage.old make_smbcodepage ; touch make_smbcodepage ; \
                 mv -f make_unicodemap.old make_unicodemap ; touch make_unicodemap ; \
         );
-        mkdir -p $(PKG_INSTALL_DIR)/usr/share/samba
-        mkdir -p $(PKG_INSTALL_DIR)/var/log
-        $(MAKE) -C $(PKG_BUILD_DIR)/source \
-                BASEDIR="$(PKG_INSTALL_DIR)/usr" \
-                BINDIR="$(PKG_INSTALL_DIR)/usr/bin" \
-                SBINDIR="$(PKG_INSTALL_DIR)/usr/bin" \
-                LIBDIR="$(PKG_INSTALL_DIR)/usr/lib" \
-                VARDIR="$(PKG_INSTALL_DIR)/var/log/samba" \
-                MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
-                CONFIGDIR="$(PKG_INSTALL_DIR)/etc/samba" \
-                PRIVATEDIR="$(PKG_INSTALL_DIR)/etc/samba" \
-                SWATDIR="$(PKG_INSTALL_DIR)/usr/swat" \
-                LOCKDIR="$(PKG_INSTALL_DIR)/var/run/samba" \
-                SAMBABOOK="$(PKG_INSTALL_DIR)/usr/swat/using_samba" \
-                CODEPAGEDIR="$(PKG_INSTALL_DIR)/usr/share/samba" \
+        mkdir -p $(WRKINST)/usr/share/samba
+        mkdir -p $(WRKINST)/var/log
+        $(MAKE) -C $(WRKBUILD)/source \
+                BASEDIR="$(WRKINST)/usr" \
+                BINDIR="$(WRKINST)/usr/bin" \
+                SBINDIR="$(WRKINST)/usr/bin" \
+                LIBDIR="$(WRKINST)/usr/lib" \
+                VARDIR="$(WRKINST)/var/log/samba" \
+                MANDIR="$(WRKINST)/usr/share/man" \
+                CONFIGDIR="$(WRKINST)/etc/samba" \
+                PRIVATEDIR="$(WRKINST)/etc/samba" \
+                SWATDIR="$(WRKINST)/usr/swat" \
+                LOCKDIR="$(WRKINST)/var/run/samba" \
+                SAMBABOOK="$(WRKINST)/usr/swat/using_samba" \
+                CODEPAGEDIR="$(WRKINST)/usr/share/samba" \
                 install
         touch $@
@@ -154 +151 @@
         install -m0644 ./files/smb.conf $(IDIR_SAMBA)/etc/samba/smb.conf
         install -d -m0755 $(IDIR_SAMBA)/usr/bin
-        install -m0755 $(PKG_BUILD_DIR)/source/bin/smbpasswd.shared $(IDIR_SAMBA)/usr/bin/smbpasswd
+        install -m0755 $(WRKBUILD)/source/bin/smbpasswd.shared $(IDIR_SAMBA)/usr/bin/smbpasswd
         install -d -m0755 $(IDIR_SAMBA)/usr/lib
-        install -m0755 $(PKG_BUILD_DIR)/source/bin/libsmb.so $(IDIR_SAMBA)/usr/lib/
+        install -m0755 $(WRKBUILD)/source/bin/libsmb.so $(IDIR_SAMBA)/usr/lib/
         install -d -m0755 $(IDIR_SAMBA)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/source/bin/nmbd.shared $(IDIR_SAMBA)/usr/sbin/nmbd
-        install -m0755 $(PKG_BUILD_DIR)/source/bin/smbd.shared $(IDIR_SAMBA)/usr/sbin/smbd
+        install -m0755 $(WRKBUILD)/source/bin/nmbd.shared $(IDIR_SAMBA)/usr/sbin/nmbd
+        install -m0755 $(WRKBUILD)/source/bin/smbd.shared $(IDIR_SAMBA)/usr/sbin/smbd
         install -d -m0755 $(IDIR_SAMBA)/usr/share/samba
-        install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/codepage.{437,850} $(IDIR_SAMBA)/usr/share/samba/
-        install -m0644 $(PKG_INSTALL_DIR)/usr/share/samba/unicode_map.{437,850} $(IDIR_SAMBA)/usr/share/samba/
+        install -m0644 $(WRKINST)/usr/share/samba/codepage.{437,850} $(IDIR_SAMBA)/usr/share/samba/
+        install -m0644 $(WRKINST)/usr/share/samba/unicode_map.{437,850} $(IDIR_SAMBA)/usr/share/samba/
         $(RSTRIP) $(IDIR_SAMBA)
         $(IPKG_BUILD) $(IDIR_SAMBA) $(PACKAGE_DIR)
@@ -168 +165 @@
 $(IPKG_SAMBA_CLIENT):
         install -d -m0755 $(IDIR_SAMBA_CLIENT)/usr/bin
-        install -m0755 $(PKG_INSTALL_DIR)/usr/bin/smbclient $(IDIR_SAMBA_CLIENT)/usr/bin/
+        install -m0755 $(WRKINST)/usr/bin/smbclient $(IDIR_SAMBA_CLIENT)/usr/bin/
         $(RSTRIP) $(IDIR_SAMBA_CLIENT)
         $(IPKG_BUILD) $(IDIR_SAMBA_CLIENT) $(PACKAGE_DIR)
 
 mostlyclean:
-        -$(MAKE) -C $(PKG_BUILD_DIR) clean
-        rm -f $(PKG_BUILD_DIR)/.built
+        -$(MAKE) -C $(WRKBUILD) clean
+        rm -f $(WRKBUILD)/.built