From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/shorewall-common/Makefile | 45 ++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 15 deletions(-)

(limited to 'package/shorewall-common')

diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index 44ddbfffe..bfa99f834 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -19,9 +19,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-install:
-	PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
+do-build:
+	PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
 	# remove configfiles folder
 	${RM} -R ${WRKINST}/usr/share/shorewall/configfiles
 
@@ -35,22 +38,34 @@ ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y)
 	gzip -9 ${WRKINST}/usr/share/shorewall/*.template
 endif
 
-post-install:
+do-install:
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
-	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* ${IDIR_SHOREWALL}/etc/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/configpath ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/modules ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/rfc1918 ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/version ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/action.* ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/macro.* ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/lib.* ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/firewall ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/functions ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup ${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
+		${IDIR_SHOREWALL}/etc/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/configpath \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/modules \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/rfc1918 \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/version \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/action.* \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/macro.* \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/lib.* \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/firewall \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/functions \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
 	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3