From: Daniel Barkalow Date: Tue, 26 Apr 2005 06:03:23 GMT Subject: [PATCH] Don't use commit-id in building Message-ID: In-Reply-To: <20050426054017.GS13052@parcelfarce.linux.theplanet.co.uk> On Tue, 26 Apr 2005, Al Viro wrote: > > > So, it still complains about commit-id > > > > In this case, it would complain about .git/HEAD even if it found > > commit-id. The right solution is probably to suppress that part if there's > > no .git/HEAD. > > The right thing is to stop assuming that everyone has . in their $PATH, > to start with... Does anyone have . in their $PATH? I've only used the commit-id that I installed previously. Since the tarball doesn't have a .git directory, the only way you end up building cogito from a directory with a repository is by using an earlier cogito or something of the sort, in which case, you probably have the program. In any case, commit-id isn't actually necessary for this operation. - We don't necessarily have commit-id available when building. Furthermore, we don't necessarily have a repository. Just put in .git/HEAD if it exists; otherwise, it's a base distribution. Signed-Off-By: Daniel Barkalow Index: Makefile =================================================================== --- f262000f302b749e485f5eb971e6aabefbb85680/Makefile (mode:100644 sha1:4f01bbbbb3fd0e53e9ce968f167b6dae68fcfa92) +++ uncommitted/Makefile (mode:100644) @@ -87,11 +87,13 @@ http-pull: LIBS += -lcurl -cg-version: $(VERSION) +cg-version: $(VERSION) .git/HEAD @echo Generating cg-version... @rm -f $@ @echo "#!/bin/sh" > $@ - @PATH=.:$(PATH) echo "echo \"$(shell cat $(VERSION)) ($(shell commit-id))\"" >> $@ + @echo -n "echo \"$(shell cat $(VERSION))" >> $@ + @if [ -r .git/HEAD ]; then echo -n " ($(shell cat .git/HEAD))" >> $@; fi + @echo "\"" >> $@ @chmod +x $@ install: $(PROG) $(SCRIPTS) $(SCRIPT) $(GEN_SCRIPT)