[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Fix --version in scripts

From: Carl Fredrik Hammar
Subject: [PATCH] Fix --version in scripts
Date: Tue, 25 May 2010 10:49:16 +0200


Emilio reported that `fakeroot --version' (fakeroot-hurd in Debian)
prints out `STANDARD_HURD_VERSION_uptime_' instead of its version.
The bug is due to a faulty make rule which depends on the original
sed script which inserted the correct version but was later inlined
into Makeconf itself (back in '99!).
The bug also affects uptime and mkfsimage.

Here's a patch which fixes this, and the actual sed script.


P.S. This message should apply correctly with `git am -c'.
* Makeconf (%): Don't depend on removed files.  Remove excess backslashes.

 Makeconf |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makeconf b/Makeconf
index e9b2045..282437d 100644
--- a/Makeconf
+++ b/Makeconf
@@ -611,6 +611,6 @@ endef
        echo '$*.o: $<' > $@
 # Rule to make executable shell scripts from .sh files.
-%: %.sh $(top_srcdir)/sh-version.sed
-       sed -e 's/STANDARD_HURD_VERSION_\\(.[^_]*\\)_/\\1 (GNU Hurd) 
$(hurd-version)/' < $< > $@
+%: %.sh
+       sed -e 's/STANDARD_HURD_VERSION_\(.[^_]*\)_/\1 (GNU Hurd) 
$(hurd-version)/' < $< > $@
        chmod +x $@
tg: (7913bea..) t/sh-version (depends on: master)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]