gtk-doc r622 - trunk

[stefkost svn gnome org]

Author: stefkost
Date: Mon Dec  1 09:50:25 2008
New Revision: 622
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=622&view=rev

Log:
	* gtkdoc-scangobj.in:
	* gtkdoc-scanobj.in:
	  Reintroduce "sh -c" and comment why its used. Add real libtool support
	  to old scanobj tool as well.



Modified:
   trunk/ChangeLog
   trunk/gtkdoc-scangobj.in
   trunk/gtkdoc-scanobj.in

Modified: trunk/gtkdoc-scangobj.in
==============================================================================
--- trunk/gtkdoc-scangobj.in	(original)
+++ trunk/gtkdoc-scangobj.in	Mon Dec  1 09:50:25 2008
@@ -1528,6 +1528,7 @@
 $LD = $ENV{LD} ? $ENV{LD} : $CC;
 $CFLAGS = $ENV{CFLAGS} ? $ENV{CFLAGS} : "";
 $LDFLAGS = $ENV{LDFLAGS} ? $ENV{LDFLAGS} : "";
+$RUN = $ENV{RUN} ? $ENV{RUN} : "";
 
 my $o_file;
 if ($CC =~ /libtool/) {
@@ -1545,7 +1546,8 @@
 system($command) == 0 or die "Linking of scanner failed: $!\n";
 
 print "gtk-doc: Running scanner $MODULE-scan\n";
-system("$ENV{RUN} ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
+# use sh -c to avoid terminating the whole run without seeing the error
+system("sh -c \"$RUN ./$MODULE-scan\"") == 0 or die "Scan failed: $!\n";
 
 unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";
 

Modified: trunk/gtkdoc-scanobj.in
==============================================================================
--- trunk/gtkdoc-scanobj.in	(original)
+++ trunk/gtkdoc-scanobj.in	Mon Dec  1 09:50:25 2008
@@ -803,6 +803,7 @@
 $LD = $ENV{LD} ? $ENV{LD} : $CC;
 $CFLAGS = $ENV{CFLAGS} ? $ENV{CFLAGS} : "";
 $LDFLAGS = $ENV{LDFLAGS} ? $ENV{LDFLAGS} : "";
+$RUN = $ENV{RUN} ? $ENV{RUN} : "";
 
 my $o_file;
 if ($CC =~ /libtool/) {
@@ -820,7 +821,8 @@
 system($command) == 0 or die "Linking of scanner failed: $!\n";
 
 print "gtk-doc: Running scanner $MODULE-scan\n";
-system("sh -c ./$MODULE-scan") == 0 or die "Scan failed: $!\n";
+# use sh -c to avoid terminating the whole run without seeing the error
+system("sh -c \"$RUN ./$MODULE-scan\"") == 0 or die "Scan failed: $!\n";
 
 unlink "./$MODULE-scan.c", "./$MODULE-scan.o", "./$MODULE-scan.lo", "./$MODULE-scan";