diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/mgetty | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/mgetty')
| -rw-r--r-- | package/mgetty/Makefile | 27 | ||||
| -rw-r--r-- | package/mgetty/ipkg/mgetty.control | 4 |
2 files changed, 13 insertions, 18 deletions
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile index 9513e9583..cb3f9b49b 100644 --- a/package/mgetty/Makefile +++ b/package/mgetty/Makefile @@ -10,12 +10,15 @@ PKG_VERSION:= 1.1.35 PKG_XVERSION:= Feb22 PKG_RELEASE:= 1 PKG_MD5SUM:= 6805f8e31423bb777be80e3a856001cb -MASTER_SITES:= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ +PKG_DESCR:= mgetty + sendfax +PKG_SECTION:= misc +PKG_SITES:= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ + DISTFILES:= ${PKG_NAME}${PKG_VERSION}-${PKG_XVERSION}.tar.gz include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MGETTY,mgetty,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MGETTY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) pre-configure: cp ${WRKBUILD}/policy.h-dist ${WRKBUILD}/policy.h @@ -33,19 +36,16 @@ pre-configure: echo "#define FAXSEND_FLOW FLOW_SOFT" >> ${WRKBUILD}/policy.h do-build: - mkdir -p ${WRKINST}/usr/bin - mkdir -p ${WRKINST}/usr/sbin - mkdir -p ${WRKINST}/usr/lib/mgetty+sendfax - mkdir -p ${WRKINST}/etc/mgetty+sendfax + ${INSTALL_DIR} ${WRKINST}/usr/bin ${WRKINST}/usr/sbin + ${INSTALL_DIR} ${WRKINST}/usr/lib/mgetty+sendfax ${WRKINST}/etc/mgetty+sendfax ${MAKE} -C ${WRKBUILD} \ ${TARGET_CONFIGURE_OPTS} \ prefix="${WRKINST}/usr" \ CONFDIR=/etc/mgetty+sendfax \ bin-all - ${CP} ${WRKBUILD}/mgetty ${WRKINST}/usr/sbin - ${CP} ${WRKBUILD}/sendfax ${WRKINST}/usr/sbin - ${CP} ${WRKBUILD}/fax/faxrunqd ${WRKINST}/usr/sbin - chmod 755 ${WRKINST}/usr/sbin/* + ${INSTALL_BIN} ${WRKBUILD}/mgetty ${WRKINST}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/sendfax ${WRKINST}/usr/sbin + ${INSTALL_BIN} ${WRKBUILD}/fax/faxrunqd ${WRKINST}/usr/sbin ${CP} ${WRKBUILD}/fax/faxq-helper ${WRKINST}/usr/lib/mgetty+sendfax chmod u+s ${WRKINST}/usr/lib/mgetty+sendfax/faxq-helper ${CP} ${WRKBUILD}/fax/cour25n.pbm ${WRKINST}/usr/lib/mgetty+sendfax @@ -58,10 +58,9 @@ do-build: (cd ${WRKINST}/usr/bin;\ ln -snf g32pbm g3topbm;\ ); - ${CP} ${WRKBUILD}/g3/g3cat ${WRKINST}/usr/bin - ${CP} ${WRKBUILD}/g3/pbm2g3 ${WRKINST}/usr/bin - ${CP} ${WRKBUILD}/g3/sff2g3 ${WRKINST}/usr/bin - chmod 755 ${WRKINST}/usr/bin/* + ${INSTALL_BIN} ${WRKBUILD}/g3/g3cat ${WRKINST}/usr/bin + ${INSTALL_BIN} ${WRKBUILD}/g3/pbm2g3 ${WRKINST}/usr/bin + ${INSTALL_BIN} ${WRKBUILD}/g3/sff2g3 ${WRKINST}/usr/bin # Installation into /etc ${CP} ${WRKBUILD}/dialin.config ${WRKINST}/etc/mgetty+sendfax ${CP} ${WRKBUILD}/fax/faxheader ${WRKINST}/etc/mgetty+sendfax diff --git a/package/mgetty/ipkg/mgetty.control b/package/mgetty/ipkg/mgetty.control deleted file mode 100644 index c280295be..000000000 --- a/package/mgetty/ipkg/mgetty.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: mgetty -Priority: optional -Section: communications -Description: mgetty + sendfax |