diff options
| author | Bernhard Reutner-Fischer | 2007-08-28 23:42:44 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer | 2007-08-28 23:42:44 +0200 |
| commit | 98a7a4c9d237cc6117ef01f3c98d3997dd48436e (patch) | |
| tree | a9239510a2f50ed168f53914307c984ff6af051b /package | |
| parent | Use correct hostap source, deprecate package due to inclusion in linux kernel (diff) | |
| download | buildroot-98a7a4c9d237cc6117ef01f3c98d3997dd48436e.tar.gz buildroot-98a7a4c9d237cc6117ef01f3c98d3997dd48436e.tar.xz buildroot-98a7a4c9d237cc6117ef01f3c98d3997dd48436e.zip | |
- misc cleanups (Cristian Ionescu-Idbohrn)
Diffstat (limited to 'package')
| -rw-r--r-- | package/dbus/dbus.mk | 2 | ||||
| -rw-r--r-- | package/jpeg/jpeg.mk | 4 | ||||
| -rw-r--r-- | package/modutils/modutils.mk | 10 | ||||
| -rw-r--r-- | package/openntpd/openntpd.mk | 1 | ||||
| -rw-r--r-- | package/tar/tar.mk | 15 |
5 files changed, 17 insertions, 15 deletions
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 8ecb39aa7..12dee320f 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -57,7 +57,7 @@ $(STAGING_DIR)/usr/lib/libdbus-1.so: $(DBUS_DIR)/$(DBUS_BINARY) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR)/dbus install $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-1.so - -mkdir $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d + mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/etc/init.d $(MAKE) DESTDIR=$(TARGET_DIR) -C $(DBUS_DIR)/dbus install rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 rm -f $(TARGET_DIR)/usr/lib/libdbus-1.la \ diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index eec158773..fe2634a2e 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -55,8 +55,8 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked --datadir=/usr/share \ --localstatedir=/var \ --includedir=/usr/include \ - --mandir=/usr/man \ - --infodir=/usr/info \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ --enable-shared \ --enable-static \ --without-x \ diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index 6253c50d8..8ad210356 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -40,7 +40,7 @@ $(MODUTILS_DIR1)/.configured: $(MODUTILS_DIR1)/.source --prefix=/ \ --sysconfdir=/etc \ ) - touch $(MODUTILS_DIR1)/.configured + touch $@ $(MODUTILS_DIR1)/.build: $(MODUTILS_DIR1)/.configured $(MAKE1) CC=$(TARGET_CC) -C $(MODUTILS_DIR1) @@ -98,7 +98,7 @@ $(MODUTILS_DIR2)/.source: $(DL_DIR)/$(MODUTILS_SOURCE) $(MODUTILS_CAT) $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf - toolchain/patch-kernel.sh $(MODUTILS_DIR2) \ package/modutils \*.patch - touch $(MODUTILS_DIR2)/.source + touch $@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source (cd $(MODUTILS_DIR2); \ @@ -109,16 +109,16 @@ $(MODUTILS_DIR2)/.configured: $(MODUTILS_DIR2)/.source --prefix=/ \ --sysconfdir=/etc \ ) - touch $(MODUTILS_DIR2)/.configured + touch $@ $(MODUTILS_DIR2)/$(MODUTILS_BINARY): $(MODUTILS_DIR2)/.configured $(MAKE1) -C $(MODUTILS_DIR2) - touch -c $(MODUTILS_DIR2)/$(MODUTILS_BINARY) + touch -c $@ $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod: $(MODUTILS_DIR2)/$(MODUTILS_BINARY) mkdir -p $(STAGING_DIR)/bin cp $(MODUTILS_DIR2)/$(MODUTILS_BINARY) $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod - touch -c $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod + touch -c $@ cross-depmod: uclibc $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-depmod diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 310d1cdb1..974582865 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -78,4 +78,3 @@ ntpd-dirclean: ifeq ($(strip $(BR2_PACKAGE_OPENNTPD)),y) TARGETS+=ntpd endif - diff --git a/package/tar/tar.mk b/package/tar/tar.mk index d76f6b2ef..bcebd0375 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -19,7 +19,7 @@ tar-source: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_DIR)/.unpacked: $(DL_DIR)/$(GNUTAR_SOURCE) $(GNUTAR_CAT) $(DL_DIR)/$(GNUTAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(GNUTAR_DIR) package/tar/ tar\*.patch - touch $(GNUTAR_DIR)/.unpacked + touch $@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked (cd $(GNUTAR_DIR); rm -rf config.cache; \ @@ -45,7 +45,7 @@ $(GNUTAR_DIR)/.configured: $(GNUTAR_DIR)/.unpacked $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ ) - touch $(GNUTAR_DIR)/.configured + touch $@ $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured $(MAKE) -C $(GNUTAR_DIR) @@ -53,12 +53,15 @@ $(GNUTAR_DIR)/$(GNUTAR_BINARY): $(GNUTAR_DIR)/.configured # This stuff is needed to work around GNU make deficiencies tar-target_binary: $(GNUTAR_DIR)/$(GNUTAR_BINARY) @if [ -L $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) ]; then \ - rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi + rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ + fi @if [ ! -f $(GNUTAR_DIR)/$(GNUTAR_BINARY) -o $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY) \ -ot $(GNUTAR_DIR)/$(GNUTAR_BINARY) ]; then \ - set -x; \ - rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ - cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); fi + set -x; \ + rm -f $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ + cp -a $(GNUTAR_DIR)/$(GNUTAR_BINARY) \ + $(TARGET_DIR)/$(GNUTAR_TARGET_BINARY); \ + fi tar: uclibc tar-target_binary |