Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: aldot at uclibc.org <aldot@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/sed
Date: Tue, 21 Aug 2007 12:35:08 -0700 (PDT)	[thread overview]
Message-ID: <20070821193508.16D19A65AC@busybox.net> (raw)

Author: aldot
Date: 2007-08-21 12:35:08 -0700 (Tue, 21 Aug 2007)
New Revision: 19629

Log:
- more cleanup (Cristian Ionescu-Idbohrn)


Modified:
   trunk/buildroot/package/sed/sed.mk


Changeset:
Modified: trunk/buildroot/package/sed/sed.mk
===================================================================
--- trunk/buildroot/package/sed/sed.mk	2007-08-21 19:33:00 UTC (rev 19628)
+++ trunk/buildroot/package/sed/sed.mk	2007-08-21 19:35:08 UTC (rev 19629)
@@ -37,33 +37,35 @@
 	mkdir -p $(HOST_SED_DIR)/bin
 	$(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(SED_DIR1) package/sed/ configure.patch
-	touch $(SED_DIR1)/.unpacked
+	touch $@
 
 $(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked
 	(cd $(SED_DIR1); rm -rf config.cache; \
 		./configure \
 		--prefix=/usr \
 	)
-	touch $(SED_DIR1)/.configured
+	touch $@
 
 $(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured
 	$(MAKE) -C $(SED_DIR1)
 
 # This stuff is needed to work around GNU make deficiencies
 build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
-	@if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ] ; then \
-		rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); fi
+	@if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ]; then \
+		rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); \
+	fi
 	@if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
-	-ot $(SED_DIR1)/$(SED_BINARY) ] ; then \
+	-ot $(SED_DIR1)/$(SED_BINARY) ]; then \
 	    set -x; \
 	    mkdir -p $(HOST_SED_DIR)/bin; \
 	    $(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \
 	    mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \
 	    rm -rf $(HOST_SED_DIR)/share/locale $(HOST_SED_DIR)/usr/info \
-		    $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; fi
+		    $(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; \
+	fi
 
 $(HOST_SED_DIR)/$(SED_TARGET_BINARY):
-	if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ] ; then \
+	if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ]; then \
 		mkdir -p "$(HOST_SED_DIR)/bin"; \
 		rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
 		ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
@@ -120,23 +122,25 @@
 		--include=$(STAGING_DIR)/usr/include \
 		$(DISABLE_NLS) \
 	)
-	touch $(SED_DIR2)/.configured
+	touch $@
 
 $(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured
 	$(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2)
 
 # This stuff is needed to work around GNU make deficiencies
 sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
-	@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \
-		rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi
+	@if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ]; then \
+		rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \
+	fi
 
 	@if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
-	-ot $(SED_DIR2)/$(SED_BINARY) ] ; then \
+	-ot $(SED_DIR2)/$(SED_BINARY) ]; then \
 	    set -x; \
 	    $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
 	    mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
 	    rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
-		    $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi
+		    $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; \
+	fi
 
 sed: uclibc sed-target_binary
 
@@ -156,4 +160,3 @@
 ifeq ($(strip $(BR2_PACKAGE_SED)),y)
 TARGETS+=sed
 endif
-

             reply	other threads:[~2007-08-21 19:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-21 19:35 aldot at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-08-04 19:04 [Buildroot] svn commit: trunk/buildroot/package/sed jacmet at uclibc.org
2008-03-06 18:24 ninevoltz at uclibc.org
2007-08-21 19:13 aldot at uclibc.org
2007-08-12 18:14 ulf at uclibc.org
2007-07-17 12:12 ulf at uclibc.org
2007-03-09  8:36 aldot at uclibc.org
2006-11-03  8:21 andersen at uclibc.org

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20070821193508.16D19A65AC@busybox.net \
    --to=aldot@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox