winemaker: Set LD_LIBRARY_PATH before calling wrc & winebuild

[Francois Gouget]

Changelog:

   Francois Gouget <fgouget at codeweavers.com>

 * tools/winemaker
   Set LD_LIBRARY_PATH if necessary before calling wrc & winebuild

-- 
Francois Gouget
fgouget at codeweavers.com

-------------- next part --------------
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.20
diff -u -r1.20 winemaker
--- tools/winemaker	2001/03/10 19:15:16	1.20
+++ tools/winemaker	2001/03/14 17:25:25
@@ -1788,7 +1917,7 @@
       print FILEO "\t-\$(STRIP) \$(STRIPFLAGS) \$\@\n";
       print FILEO "\n";
       print FILEO "\$(${canon}_SPEC_SRCS:.spec=.spec.c): \$(${canon}_SPEC_SRCS:.spec) \$(${canon}_SPEC_SRCS:.spec=.tmp.o) \$(${canon}_RC_SRCS:.rc=.res)\n";
-      print FILEO "\t\$(WINEBUILD) -fPIC \$(${canon}_LIBRARY_PATH) \$(WINE_LIBRARY_PATH) -sym \$(${canon}_SPEC_SRCS:.spec=.tmp.o) -o \$\@ -spec \$(${canon}_SPEC_SRCS)\n";
+      print FILEO "\t\$(LD_PATH) \$(WINEBUILD) -fPIC \$(${canon}_LIBRARY_PATH) \$(WINE_LIBRARY_PATH) -sym \$(${canon}_SPEC_SRCS:.spec=.tmp.o) -o \$\@ -spec \$(${canon}_SPEC_SRCS)\n";
       print FILEO "\n";
       my $t_name=@$target[$T_NAME];
       if (@$target[$T_TYPE]!=$TT_DLL) {
@@ -2451,6 +2580,7 @@
 
 dnl **** Try to find where winelib is located ****
 
+LD_PATH="";
 WINE_INCLUDE_ROOT="";
 WINE_INCLUDE_PATH="";
 WINE_LIBRARY_ROOT="";
@@ -2549,6 +2679,10 @@
 then
   WINE_LIBRARY_PATH="$WINE_LIBRARY_PATH -L$LIBNTDLL_PATH"
 fi
+if test -n "$WINE_LIBRARY_PATH"
+then
+  LD_PATH="LD_LIBRARY_PATH=\"`echo $WINE_LIBRARY_PATH | sed -e 's/ *-L/:/g' -e 's/^://' -e 's/ *$//'`:\$\$LD_LIBRARY_PATH\""
+fi
 
 if test -z "$WINE_TOOL_PATH"
 then
@@ -2570,6 +2704,7 @@
   AC_MSG_ERROR([Could not find Wine's wrc tool])
 fi
 
+AC_SUBST(LD_PATH)
 AC_SUBST(WINE_INCLUDE_PATH)
 AC_SUBST(WINE_LIBRARY_PATH)
 
@@ -2747,13 +2882,15 @@
 # SPEC_SRCS    : interface definition files
 
 
-# Where is Winelib
+# Where is Wine
 
 WINE_INCLUDE_ROOT = @WINE_INCLUDE_ROOT@
 WINE_INCLUDE_PATH = @WINE_INCLUDE_PATH@
 WINE_LIBRARY_ROOT = @WINE_LIBRARY_ROOT@
 WINE_LIBRARY_PATH = @WINE_LIBRARY_PATH@
 
+LD_PATH           = @LD_PATH@
+
 # Where are the MFC
 
 ATL_INCLUDE_ROOT = @ATL_INCLUDE_ROOT@
@@ -2833,7 +2970,7 @@
 	$(CXX) -c $(ALLCXXFLAGS) -o $@ $<
 
 .rc.res:
-	$(WRC) $(ALLWRCFLAGS) -o $@ $<
+	$(LD_PATH) $(WRC) $(ALLWRCFLAGS) -o $@ $<
 
 .PHONY: all install uninstall clean distclean depend dummy