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

package/snort/Makefile

@@ -10 +10 @@
 PKG_SOURCE_URL:=http://www.snort.org/dl/current/
 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
@@ -90 +87 @@
 
 ifneq ($(BR2_PACKAGE_$(1)),)
-BUILD_TARGETS += $(PKG_BUILD_DIR)/$(2)
+BUILD_TARGETS += $(WRKBUILD)/$(2)
 endif
 
-$(PKG_BUILD_DIR)/$(2): $(PKG_BUILD_DIR)/.prepared
-        touch -r $(PKG_BUILD_DIR)/Makefile.am $(PKG_BUILD_DIR)/configure.in 
-        touch -r $(PKG_BUILD_DIR)/Makefile.in $(PKG_BUILD_DIR)/configure
-        -$(MAKE) -C $(PKG_BUILD_DIR) distclean
-        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+$(WRKBUILD)/$(2): $(WRKBUILD)/.prepared
+        touch -r $(WRKBUILD)/Makefile.am $(WRKBUILD)/configure.in 
+        touch -r $(WRKBUILD)/Makefile.in $(WRKBUILD)/configure
+        -$(MAKE) -C $(WRKBUILD) distclean
+        (cd $(WRKBUILD); rm -rf config.{cache,status} ; \
                 $(TARGET_CONFIGURE_OPTS) \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -106 +103 @@
                   $$($(1)_CONFIGURE_OPTS) \
         );
-        $(MAKE) -C $(PKG_BUILD_DIR)
-        mv $(PKG_BUILD_DIR)/src/snort $(PKG_BUILD_DIR)/$(2)
+        $(MAKE) -C $(WRKBUILD)
+        mv $(WRKBUILD)/src/snort $(WRKBUILD)/$(2)
 
-$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.installed $(PKG_BUILD_DIR)/$(2)
+$$(IPKG_$(1)): $(WRKBUILD)/.installed $(WRKBUILD)/$(2)
         install -m0644 ./ipkg/snort.conffiles $$(IDIR_$(1))/CONTROL/conffiles
         install -d -m0755 $$(IDIR_$(1))/etc/default
@@ -116 +113 @@
         install -m0755 ./files/snort.init $$(IDIR_$(1))/etc/init.d/snort
         install -d -m0755 $$(IDIR_$(1))/etc/snort
-        install -m0644 $(PKG_BUILD_DIR)/etc/snort.conf $$(IDIR_$(1))/etc/snort/
-        install -m0644 $(PKG_BUILD_DIR)/etc/classification.config $$(IDIR_$(1))/etc/snort/
-        install -m0644 $(PKG_BUILD_DIR)/etc/gen-msg.map $$(IDIR_$(1))/etc/snort/
-        install -m0644 $(PKG_BUILD_DIR)/etc/reference.config $$(IDIR_$(1))/etc/snort/
-        install -m0644 $(PKG_BUILD_DIR)/etc/sid-msg.map $$(IDIR_$(1))/etc/snort/
-        install -m0644 $(PKG_BUILD_DIR)/etc/threshold.conf $$(IDIR_$(1))/etc/snort/
-        install -m0644 $(PKG_BUILD_DIR)/etc/unicode.map $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/snort.conf $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/classification.config $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/gen-msg.map $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/reference.config $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/sid-msg.map $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/threshold.conf $$(IDIR_$(1))/etc/snort/
+        install -m0644 $(WRKBUILD)/etc/unicode.map $$(IDIR_$(1))/etc/snort/
         install -d -m0755 $$(IDIR_$(1))/usr/sbin
-        install -m0755 $(PKG_BUILD_DIR)/$(2) $$(IDIR_$(1))/usr/sbin/snort
+        install -m0755 $(WRKBUILD)/$(2) $$(IDIR_$(1))/usr/sbin/snort
         $(RSTRIP) $$(IDIR_$(1))
         mkdir -p $(PACKAGE_DIR)
@@ -141 +138 @@
 $(eval $(call PKG_build,SNORT_CUSTOM,snort-custom,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured:
+$(WRKBUILD)/.configured:
         touch $@
 
-$(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS)
+$(WRKBUILD)/.built: $(BUILD_TARGETS)
         touch $@
 
-$(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
-        mkdir -p $(PKG_INSTALL_DIR)
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                DESTDIR="$(PKG_INSTALL_DIR)" \
+$(WRKBUILD)/.installed: $(WRKBUILD)/.built
+        mkdir -p $(WRKINST)
+        $(MAKE) -C $(WRKBUILD) \
+                DESTDIR="$(WRKINST)" \
                 install
-        touch $(PKG_BUILD_DIR)/.installed
+        touch $(WRKBUILD)/.installed