diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-06 18:00:47 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-06 18:00:47 +0100 |
| commit | ba1c52480a9bd71d24c4440979a35a5bf93033af (patch) | |
| tree | 47007fe586a75022738abd5dfdff2bf45a644036 /package/shorewall-common | |
| parent | 9b8c9ac77b7e64b3cd7450120813ee0727be896e (diff) | |
| parent | ea7f7a6dee13b456ce43ad0ec14dbbc6718e678f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/shorewall-common')
| -rw-r--r-- | package/shorewall-common/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index bfa99f834..5e311d358 100644 --- a/package/shorewall-common/Makefile +++ b/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 |