diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-17 12:30:31 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-09-17 12:30:31 +0000 |
| commit | e4c6340a949f64e6fc0294a1e41cf05dbaa82df9 (patch) | |
| tree | 12a7f94b8461feec5eb1ad87481ddb06eb6834f8 /package/dm | |
| parent | b14ff970126831720990961f0a7e2fd5f019365d (diff) | |
| download | buildroot-novena-e4c6340a949f64e6fc0294a1e41cf05dbaa82df9.tar.gz buildroot-novena-e4c6340a949f64e6fc0294a1e41cf05dbaa82df9.zip | |
- cleanup and fixes (Cristian Ionescu-Idbohrn)
Diffstat (limited to 'package/dm')
| -rw-r--r-- | package/dm/dm.mk | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/package/dm/dm.mk b/package/dm/dm.mk index d1862a556..a43e66772 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -46,7 +46,7 @@ dm-source: $(DL_DIR)/$(DM_SOURCE) $(DM_DIR)/.unpacked: $(DL_DIR)/$(DM_SOURCE) $(DM_CAT) $(DL_DIR)/$(DM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(DM_DIR) package/dm/ \*.patch - touch $(DM_DIR)/.unpacked + touch $@ $(DM_DIR)/.configured: $(DM_DIR)/.unpacked (cd $(DM_DIR); rm -rf config.cache; \ @@ -71,14 +71,14 @@ $(DM_DIR)/.configured: $(DM_DIR)/.unpacked --sysconfdir=/etc \ --datadir=/usr/share \ --localstatedir=/var \ - --includedir=/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --includedir=/usr/include \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ --with-user=$(shell id -un) --with-group=$(shell id -gn) \ ) - touch $(DM_DIR)/.configured + touch $@ $(DM_DIR)/$(DM_BINARY): dm-build $(DM_DIR)/$(DM_LIBRARY): dm-build @@ -91,19 +91,19 @@ $(DM_STAGING_BINARY) $(DM_STAGING_LIBRARY): $(DM_DIR)/.configured $(DM_TARGET_BINARY): $(DM_STAGING_BINARY) $(INSTALL) -m 0755 $? $@ -$(STRIP) $(DM_TARGET_BINARY) - touch -c $(DM_TARGET_BINARY) + touch -c $@ # Install libdevmapper.so.1.00 from staging to target $(DM_TARGET_LIBRARY).$(DM_BASEVER): $(DM_STAGING_LIBRARY) $(INSTALL) -m 0644 $? $@ - -$(STRIP) $(DM_TARGET_LIBRARY) - touch -c $(DM_TARGET_LIBRARY).$(DM_BASEVER) + -$(STRIP) $@ + touch -c $@ # Makes libdevmapper.so a symlink to libdevmapper.so.1.00 $(DM_TARGET_LIBRARY): $(DM_TARGET_LIBRARY).$(DM_BASEVER) rm -f $@ ln -s $(<F) $@ - touch -c $(DM_TARGET_LIBRARY) + touch -c $@ # Install header file $(DM_TARGET_HEADER): $(DM_TARGET_LIBRARY) @@ -114,7 +114,8 @@ $(DM_TARGET_HEADER): $(DM_TARGET_LIBRARY) 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) + rm $(DM_TARGET_BINARY) $(DM_TARGET_LIBRARY) \ + $(DM_TARGET_LIBRARY).$(DM_BASEVER) $(DM_TARGET_HEADER) $(MAKE) -C $(DM_DIR) clean dm-dirclean: |