From 7b0ad787d6fb0e967e4ee938fffaf804cf433588 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 19 Sep 2007 20:13:08 +0000 Subject: - fixes and cleanups (Cristian Ionescu-Idbohrn) --- project/project.mk | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'project') diff --git a/project/project.mk b/project/project.mk index 4857a92dc..b85fe3915 100644 --- a/project/project.mk +++ b/project/project.mk @@ -1,7 +1,7 @@ PROJECT_FILE:=$(LOCAL)/$(PROJECT)/$(PROJECT).config -.PHONY: target-host-info saveconfig getconfig +.PHONY: target-host-info saveconfig getconfig target-host-info: $(TARGET_DIR)/etc/issue $(TARGET_DIR)/etc/hostname @@ -18,27 +18,31 @@ $(TARGET_DIR)/etc/hostname: .config saveconfig: $(CONFIG)/conf mkdir -p $(LOCAL)/$(PROJECT) -cp .config $(PROJECT_FILE) - if [ -f $(LINUX26_DIR)/.config ] ; then \ - cp $(LINUX26_DIR)/.config $(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config ; \ - $(SED) '/BR2_PACKAGE_LINUX_KCONFIG/d' $(PROJECT_FILE) ; \ - echo "BR2_PACKAGE_LINUX_KCONFIG:=$(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config" >> $(PROJECT_FILE) ; \ + if [ -f $(LINUX26_DIR)/.config ]; then \ + cp $(LINUX26_DIR)/.config \ + $(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config; \ + $(SED) '/BR2_PACKAGE_LINUX_KCONFIG/d' $(PROJECT_FILE); \ + echo "BR2_PACKAGE_LINUX_KCONFIG:=$(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config" >> $(PROJECT_FILE); \ fi - if [ -f $(BUSYBOX_DIR)/.config ] ; then \ - cp $(BUSYBOX_DIR)/.config $(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config ; \ - $(SED) '/BR2_PACKAGE_BUSYBOX_CONFIG/d' $(PROJECT_FILE) ; \ - echo "BR2_PACKAGE_BUSYBOX_CONFIG:=$(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config" >> $(PROJECT_FILE) ; \ + if [ -f $(BUSYBOX_DIR)/.config ]; then \ + cp $(BUSYBOX_DIR)/.config \ + $(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config; \ + $(SED) '/BR2_PACKAGE_BUSYBOX_CONFIG/d' $(PROJECT_FILE); \ + echo "BR2_PACKAGE_BUSYBOX_CONFIG:=$(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config" >> $(PROJECT_FILE); \ fi - if [ -f $(UCLIBC_DIR)/.config ] ; then \ - cp $(UCLIBC_DIR)/.config $(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config ; \ - $(SED) '/BR2_UCLIBC_CONFIG/d' $(PROJECT_FILE) ; \ - echo "BR2_UCLIBC_CONFIG:=$(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config" >> $(PROJECT_FILE) ; \ + if [ -f $(UCLIBC_DIR)/.config ]; then \ + cp $(UCLIBC_DIR)/.config \ + $(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config; \ + $(SED) '/BR2_UCLIBC_CONFIG/d' $(PROJECT_FILE); \ + echo "BR2_UCLIBC_CONFIG:=$(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config" >> $(PROJECT_FILE); \ fi - if [ -f $(UBOOT_DIR)/include/configs/$(PROJECT).h ] ; then \ - cp $(UBOOT_DIR)/include/configs/$(PROJECT).h $(LOCAL)/$(PROJECT)/u-boot/$(PROJECT).h ; \ + if [ -f $(UBOOT_DIR)/include/configs/$(PROJECT).h ]; then \ + cp $(UBOOT_DIR)/include/configs/$(PROJECT).h \ + $(LOCAL)/$(PROJECT)/u-boot/$(PROJECT).h; \ fi getconfig: $(CONFIG)/conf - -cp $(LOCAL)/$(PROJECT)/$(PROJECT).config .config + -cp $(LOCAL)/$(PROJECT)/$(PROJECT).config .config vendor-dbg: @echo VENDOR_SITE=$(BR2_VENDOR_SITE) -- cgit v1.2.3