Changeset d419478 in freewrt for package/monit/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/monit/Makefile (modified) (6 diffs)

package/monit/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.tildeslash.com/monit/dist/
 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
@@ -19 +17 @@
 $(eval $(call PKG_template,MONIT_NOSSL,monit-nossl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built:
+$(WRKBUILD)/.built:
 ifneq ($(BR2_PACKAGE_MONIT),)
-        ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+        ( cd $(WRKBUILD); rm -rf config.{cache,status} ; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -50 +48 @@
                         --with-ssl-dir="$(STAGING_DIR)/usr" \
         );
-        $(MAKE) -C $(PKG_BUILD_DIR)
-        ( cd $(PKG_BUILD_DIR); mv monit monit-ssl; )
+        $(MAKE) -C $(WRKBUILD)
+        ( cd $(WRKBUILD); mv monit monit-ssl; )
 endif
 ifneq ($(BR2_PACKAGE_MONIT),)
-        ( cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+        ( cd $(WRKBUILD); rm -rf config.{cache,status} ; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -79 +77 @@
                         --without-ssl \
         );
-        $(MAKE) -C $(PKG_BUILD_DIR)
-        ( cd $(PKG_BUILD_DIR); mv monit monit-nossl; )
-        $(MAKE) -C $(PKG_BUILD_DIR) clean
+        $(MAKE) -C $(WRKBUILD)
+        ( cd $(WRKBUILD); mv monit monit-nossl; )
+        $(MAKE) -C $(WRKBUILD) clean
 endif
         touch $@
@@ -87 +85 @@
 $(IPKG_MONIT):
         install -d -m0755 $(IDIR_MONIT)/etc
-        install -m0600 $(PKG_BUILD_DIR)/monitrc $(IDIR_MONIT)/etc/
+        install -m0600 $(WRKBUILD)/monitrc $(IDIR_MONIT)/etc/
         install -d -m0755 $(IDIR_MONIT)/etc/init.d
         install -m0755 ./files/monit.init $(IDIR_MONIT)/etc/init.d/monit
         install -d -m0755 $(IDIR_MONIT)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/monit-ssl $(IDIR_MONIT)/usr/sbin/monit
+        install -m0755 $(WRKBUILD)/monit-ssl $(IDIR_MONIT)/usr/sbin/monit
         $(RSTRIP) $(IDIR_MONIT)
         $(IPKG_BUILD) $(IDIR_MONIT) $(PACKAGE_DIR)
@@ -97 +95 @@
 $(IPKG_MONIT_NOSSL):
         install -d -m0755 $(IDIR_MONIT_NOSSL)/etc
-        install -m0600 $(PKG_BUILD_DIR)/monitrc $(IDIR_MONIT_NOSSL)/etc/
+        install -m0600 $(WRKBUILD)/monitrc $(IDIR_MONIT_NOSSL)/etc/
         install -d -m0755 $(IDIR_MONIT_NOSSL)/etc/init.d
         install -m0755 ./files/monit.init $(IDIR_MONIT_NOSSL)/etc/init.d/monit
         install -d -m0755 $(IDIR_MONIT_NOSSL)/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/monit-nossl $(IDIR_MONIT_NOSSL)/usr/sbin/monit
+        install -m0755 $(WRKBUILD)/monit-nossl $(IDIR_MONIT_NOSSL)/usr/sbin/monit
         $(RSTRIP) $(IDIR_MONIT_NOSSL)
         $(IPKG_BUILD) $(IDIR_MONIT_NOSSL) $(PACKAGE_DIR)