From: Pavel Roskin <proski@gnu.org>
Date: Tue, 26 Apr 2005 16:06:10 GMT
Subject: [PATCH] Cogito chicken-and-egg problem
Message-ID: <1114531570.19478.6.camel@dv>

Hello!

My patch for Makefile was misapplied, so installed commit-id is still
needed for "make" to succeed.

Shell commands are processed by make before being passed to the shell,
and $(...) is expanded by make before new PATH is set, as it is done in
the current Makefile.

Also, the dependency on commit-id was dropped from my patch for some
reason.  I believe it's still needed.  Also, we need a dependency on
cat-file, which is used by commit-id internally.

Signed-off-by: Pavel Roskin <proski@gnu.org>

Index: Makefile
===================================================================
--- f262000f302b749e485f5eb971e6aabefbb85680/Makefile  (mode:100644 sha1:4f01bbbbb3fd0e53e9ce968f167b6dae68fcfa92)
+++ uncommitted/Makefile  (mode:100644)
@@ -87,11 +87,11 @@
 http-pull: LIBS += -lcurl
 
 
-cg-version: $(VERSION)
+cg-version: $(VERSION) commit-id cat-file
 	@echo Generating cg-version...
 	@rm -f $@
 	@echo "#!/bin/sh" > $@
-	@PATH=.:$(PATH) echo "echo \"$(shell cat $(VERSION)) ($(shell commit-id))\"" >> $@
+	@echo "echo \"$(shell cat $(VERSION)) ($(shell PATH=.:$(PATH) ./commit-id))\"" >> $@
 	@chmod +x $@
 
 install: $(PROG) $(SCRIPTS) $(SCRIPT) $(GEN_SCRIPT)


-- 
Regards,
Pavel Roskin