diff options
| author | Jim Meyering <jim@meyering.net> | 2009-11-20 16:25:00 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-11-20 15:40:19 +0000 |
| commit | e1b48287ebd6143ba516e427772dca04b4b8c75d (patch) | |
| tree | 8f517c5e9abdb7aba60055f6dd1b66abf9843ed7 /cfg.mk | |
| parent | 1b4bab6db252abcc3daab11159b0e45862c10b4c (diff) | |
| download | libguestfs-e1b48287ebd6143ba516e427772dca04b4b8c75d.tar.gz libguestfs-e1b48287ebd6143ba516e427772dca04b4b8c75d.tar.xz libguestfs-e1b48287ebd6143ba516e427772dca04b4b8c75d.zip | |
build: correct sed transformation to work also on .git-module-status
My patch was wrong.
I kept the sed transformation the same in the two places,
but it wasn't strict enough to also work on the file contents.
Sorry about that. This fixes it.
>From 93927cc7b9f63c414e5bfeb7eba393fde3295601 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 20 Nov 2009 16:23:17 +0100
Subject: [PATCH libguestfs] build: correct sed transformation to work also on .git-module-status
* autogen.sh: Use a more strict sed transformation so it works also
on the contents of .git-module-status, which has no prefix.
* cfg.mk (_submodule_hash): Use a stricter sed regexp.
Diffstat (limited to 'cfg.mk')
| -rw-r--r-- | cfg.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -132,7 +132,9 @@ ifeq (0,$(MAKELEVEL)) # submodule name. Contrast these: # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib # b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda) - _submodule_hash = sed 's/.//;s/ .*//' + # $ cat .git-module-status + # b653eda3ac4864de205419d9f41eec267cb89eeb + _submodule_hash = sed 's/^[ -]//;s/ .*//' _update_required := $(shell \ actual=$$(git submodule status | $(_submodule_hash)); \ stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \ |