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/device-mapper/Makefile | |
| 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/device-mapper/Makefile')
| -rw-r--r-- | package/device-mapper/Makefile | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/package/device-mapper/Makefile b/package/device-mapper/Makefile index 38b738ca3..b0e48e7a9 100644 --- a/package/device-mapper/Makefile +++ b/package/device-mapper/Makefile @@ -9,20 +9,17 @@ PKG_NAME:= device-mapper PKG_VERSION:= 1.02.28 PKG_RELEASE:= 1 PKG_MD5SUM:= c9ae0776994a419f9e1ba842164bb626 -DISTFILES:= ${PKG_NAME}.${PKG_VERSION}.tgz -MASTER_SITES:= ftp://sources.redhat.com/pub/dm/ +PKG_DESCR:= device mapper tools and libraries +PKG_SECTION:= utils +PKG_URL:= http://sources.redhat.com/dm +PKG_SITES:= ftp://sources.redhat.com/pub/dm/ +DISTFILES:= ${PKG_NAME}.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME}.${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE})) - -ifeq ($(DEBUG),1) -CONFIGURE_ARGS+= --enable-debug -else -CONFIGURE_ARGS+= --disable-debug -endif +$(eval $(call PKG_template,DEVICE_MAPPER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-user="" --with-group="" \ @@ -33,8 +30,7 @@ INSTALL_STYLE:= auto INSTALL_TARGET+= install_static_lib post-install: - ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin - ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/lib + ${INSTALL_DIR} ${IDIR_DEVICE_MAPPER}/usr/sbin ${IDIR_DEVICE_MAPPER}/usr/lib ${CP} ${WRKINST}/usr/lib/libdevmapper.so* \ ${IDIR_DEVICE_MAPPER}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/sbin/dmsetup \ |