Re: [Ekiga-devel-list] Warning for revision.h

[Michael Rickmann <mrickma gwdg de>]

Am Donnerstag, den 30.04.2009, 16:41 +0200 schrieb Eugen Dedu:
> Hi,
> 
> After the update of revision.h I receive the following wraning:
> Making install in src
> /bin/sh: line 0: cd: ../.git: No such file or directory
> fatal: Not a git repository (or any of the parent directories): .git
> /bin/sh: line 0: cd: ../.git: No such file or directory
> fatal: Not a git repository (or any of the parent directories): .git
> make[2]: Entering directory 
> `/home/dedu/softs/ekiga/toto/ekiga-3.2.0+git20090430.81e65f/src'
> /usr/bin/make  install-am
> /bin/sh: line 0: cd: ../.git: No such file or directory
> fatal: Not a git repository (or any of the parent directories): .git
> /bin/sh: line 0: cd: ../.git: No such file or directory
> fatal: Not a git repository (or any of the parent directories): .git
> make[3]: Entering directory 
> `/home/dedu/softs/ekiga/toto/ekiga-3.2.0+git20090430.81e65f/src'
> /bin/sh: line 0: cd: ../.git: No such file or directory
> fatal: Not a git repository (or any of the parent directories): .git
> /bin/sh: line 0: cd: ../.git: No such file or directory
> fatal: Not a git repository (or any of the parent directories): .git
> make[4]: Entering directory 
> `/home/dedu/softs/ekiga/toto/ekiga-3.2.0+git20090430.81e65f/src'
> 
> This is because cd ../.git is always executed in src/Makefile.am:
> GIT_REVISION=\"$(shell (cd ../.git; git describe ))\"
> CACHED_REVISION=$(shell cat revision.h 2>/dev/null | cut -c24-)
> 
> There should be an if before the "cd"...
> 
Sorry, I did not recognize that the $(shell ) constructs are executed
each time a Makefile is read. Could you test attached patch? It seems
allright for me.
Regards
Michael

diff -ur ekiga.orig/src/Makefile.am ekiga/src/Makefile.am
--- ekiga.orig/src/Makefile.am	2009-05-01 07:54:03.643040332 +0200
+++ ekiga/src/Makefile.am	2009-05-01 07:56:10.011040557 +0200
@@ -137,11 +137,11 @@
 .rc.o:
 	$(LIBTOOL) --tag=RC --mode=compile $(RC) $< -o $@ -I $(top_srcdir)
 
-GIT_REVISION=\"$(shell (cd ../.git; git describe ))\"
-CACHED_REVISION=$(shell cat revision.h 2>/dev/null | cut -c24-)
+GIT_REVISION=\"$$(cd ../.git; git describe )\"
+CACHED_REVISION=$$(cat revision.h 2>/dev/null | cut -c24-)
 
 src/revision.h:
-$(shell if test -d "../.git" -a -n "$$(which git)"; then \
+	if test -d "../.git" -a -n "$$(which git)"; then \
           if test "x$(GIT_REVISION)" != "x$(CACHED_REVISION)"; then \
             echo "#define EKIGA_REVISION $(GIT_REVISION)" > revision.h; \
           fi \
@@ -149,7 +149,7 @@
           if !(test -e "./revision.h"); then\
             echo "#define EKIGA_REVISION \"unknown\"" > revision.h; \
           fi \
-        fi)
+        fi
 
 AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
 AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)