move binary to /usr

package/shorewall-common/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		shorewall-common
 PKG_VERSION:=		4.0.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2df43356b1fdbc91920d48c5595aa101
 PKG_DESCR:=		high-level netfilter configuration tool
 PKG_SECTION:=		net
@@ -17,7 +17,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SHOREWALL,shorewall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -41,7 +41,7 @@ endif
 do-install:
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
-	${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
+	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
 		${IDIR_SHOREWALL}/etc/shorewall/
 	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
@@ -66,6 +66,6 @@ do-install:
 		${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
+	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk