[prev in list] [next in list] [prev in thread] [next in thread] 

List:       garnome-list
Subject:    gar.lib.mk patch
From:       Peter <sw98234 () hotmail ! com>
Date:       2007-01-25 19:42:57
Message-ID: epb181$q1s$1 () sea ! gmane ! org
[Download RAW message or body]

When users use system versions of libtool or intltoolize, garnome builds fail
because of incorrect logic. This patch corrects this problem:

--- gar.lib.mk.old      2007-01-25 14:26:05.000000000 -0500
+++ gar.lib.mk  2007-01-25 14:26:54.000000000 -0500
@@ -305,9 +305,9 @@
 fixup-%/intltool:
        @echo " ==> Re-intltoolizing $*"
        @if which intltoolize > /dev/null; then \
-                       INTLTOOLIZE=$(bindir)/intltoolize; \
+                       INTLTOOLIZE=$(shell which intltoolize); \
                else \
-                       INTLTOOLIZE=$(shell which intltoolize > /dev/null 2>&1);      \
  \
+                       INTLTOOLIZE=$(bindir)/intltoolize; \
                fi; \
        cd $* && $$INTLTOOLIZE --copy --force
        @if test -z $?; then $(MAKECOOKIE); fi
@@ -315,9 +315,9 @@
 fixup-%/libtool:
        @echo " ==> Re-libtoolizing $*"
        @if which libtoolize > /dev/null; then \
-                       LIBTOOLIZE=$(bindir)/libtoolize; \
+                       LIBTOOLIZE=$(shell which libtoolize); \
                else \
-                       LIBTOOLIZE=$(shell which libtoolize > /dev/null 2>&1); \
+                       LIBTOOLIZE=$(bindir)/libtoolize; \
                fi; \
        cd $* && $$LIBTOOLIZE --copy --force
        @if test -z $?; then $(MAKECOOKIE); fi


-- 
Peter

-- 
garnome-list mailing list
garnome-list@gnome.org
http://mail.gnome.org/mailman/listinfo/garnome-list


[prev in list] [next in list] [prev in thread] [next in thread]