diff options
| author | Eric Andersen <andersen@codepoet.org> | 2007-09-12 08:52:44 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2007-09-12 08:52:44 +0000 |
| commit | be8d1debc62ee27b52ad4b837e066bcc7b04a0f1 (patch) | |
| tree | 7269b35b4ce7dccda2bf2e4ff3af9016b0e5498c | |
| parent | 9952cfa5c429dc2ee3ba4b24a7974c91bf9a3d29 (diff) | |
bump version, fixup some brokenness
| -rw-r--r-- | package/dm/dm.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/dm/dm.mk b/package/dm/dm.mk index 2f828ed63..c85a28202 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -24,7 +24,7 @@ # USA DM_BASEVER=1.02 -DM_PATCH=20 +DM_PATCH=22 DM_VERSION=$(DM_BASEVER).$(DM_PATCH) DM_SOURCE:=device-mapper.$(DM_VERSION).tgz DM_SITE:=ftp://sources.redhat.com/pub/dm @@ -35,7 +35,7 @@ DM_STAGING_BINARY:=$(STAGING_DIR)/usr/sbin/dmsetup DM_TARGET_BINARY:=$(TARGET_DIR)/usr/sbin/dmsetup DM_STAGING_LIBRARY:=$(STAGING_DIR)/lib/libdevmapper.so DM_TARGET_LIBRARY:=$(TARGET_DIR)/usr/lib/libdevmapper.so -DM_TARGET_HEADER:=$(TARGET_DIR)/usr/include/libdevmapper.h +DM_TARGET_HEADER:=$(TARGET_DIR)/include/libdevmapper.h $(DL_DIR)/$(DM_SOURCE): $(WGET) -P $(DL_DIR) $(DM_SITE)/$(DM_SOURCE) || \ @@ -86,7 +86,6 @@ $(DM_DIR)/$(DM_LIBRARY): dm-build $(DM_STAGING_BINARY) $(DM_STAGING_LIBRARY): $(DM_DIR)/.configured $(MAKE) CC=$(TARGET_CC) -C $(DM_DIR) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DM_DIR) install - mv $(STAGING_DIR)/include/libdevmapper.h $(STAGING_DIR)/usr/include/libdevmapper.h # Install dmsetup from staging to target $(DM_TARGET_BINARY): $(DM_STAGING_BINARY) @@ -109,9 +108,10 @@ $(DM_TARGET_LIBRARY): $(DM_TARGET_LIBRARY).$(DM_BASEVER) # Install header file $(DM_TARGET_HEADER): $(DM_TARGET_LIBRARY) rm -f $@ - $(INSTALL) -m 0644 $(STAGING_DIR)/usr/include/libdevmapper.h $@ + mkdir -p $(STAGING_DIR)/include + $(INSTALL) -m 0644 $(STAGING_DIR)/include/libdevmapper.h $@ -dm: uclibc $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) $(DM_TARGET_HEADER) +dm: uclibc $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) #$(DM_TARGET_HEADER) dm-clean: rm $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) $(DM_TARGET_LIBRARY).$(DM_BASEVER) $(DM_TARGET_HEADER) |