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/gpm | |
| 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/gpm')
| -rw-r--r-- | package/gpm/Makefile | 10 | ||||
| -rw-r--r-- | package/gpm/ipkg/gpm.control | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/package/gpm/Makefile b/package/gpm/Makefile index 05750957f..341ce0333 100644 --- a/package/gpm/Makefile +++ b/package/gpm/Makefile @@ -9,11 +9,14 @@ PKG_NAME:= gpm PKG_VERSION:= 1.20.5 PKG_RELEASE:= 1 PKG_MD5SUM:= 3915bdd6bf947ef867752a30b4be2387 -MASTER_SITES:= http://unix.schottelius.org/gpm/archives/ +PKG_DESCR:= console mouse support +PKG_SECTION:= text +PKG_URL:= http://unix.schottelius.org/gpm +PKG_SITES:= http://unix.schottelius.org/gpm/archives/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GPM,gpm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GPM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu TCFLAGS+= -I${WRKSRC}/src/headers @@ -21,8 +24,7 @@ BUILD_STYLE:= auto INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_GPM}/usr/sbin/ - ${INSTALL_DIR} ${IDIR_GPM}/usr/lib/ + ${INSTALL_DIR} ${IDIR_GPM}/usr/sbin ${IDIR_GPM}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/sbin/gpm ${IDIR_GPM}/usr/sbin/ ${CP} ${WRKINST}/usr/lib/libgpm.so.* ${IDIR_GPM}/usr/lib/ diff --git a/package/gpm/ipkg/gpm.control b/package/gpm/ipkg/gpm.control deleted file mode 100644 index 713af12a1..000000000 --- a/package/gpm/ipkg/gpm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: gpm -Priority: optional -Section: text -Description: GPM |