PATCH: Makefile.in -- fix LDCONFIG on FreeBSD (RESEND)

Gerald Pfeifer gerald at pfeifer.com
Sun Oct 2 16:30:24 CDT 2005


[ I guess this was considered risky directly before the previous
  snapshot, but it would be great could we get this into CVS now. ]

A hacky variant of this has been in several local trees for ages.

Basically, the current version of the install target in Wine CVS won't 
work on FreeBSD (and I guess others) and may in fact hose the system 
(though I forgot the details).  Plus the comments shown to the user
don't really apply.

Most of this patch is whitespace changes. :-)

Gerald

ChangeLog:
Add appropriate $(LDCONFIG) invocation for FreeBSD.

Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/Makefile.in,v
retrieving revision 1.165
diff -u -3 -p -r1.165 Makefile.in
--- Makefile.in	21 Sep 2005 14:23:54 -0000	1.165
+++ Makefile.in	24 Sep 2005 18:44:25 -0000
@@ -86,17 +86,20 @@ install-lib:: $(INSTALLLIBSUBDIRS:%=%/__
 install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal
 
 install:: install-lib install-dev install-aclocal
-	-$(LDCONFIG)
-	@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`";	\
-	then								\
-		echo "*************************************************" ; \
-		echo "*************************************************" ; \
-		echo "The installed Wine libraries will not be found!" ; \
-		echo "You can either:" ; 				\
-		echo "   Add the line '$(libdir)' to /etc/ld.so.conf and run /sbin/ldconfig" ;	\
-		echo '   export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
-		echo "*************************************************" ; \
-		echo "*************************************************" ; \
+	@if [ `uname -s` = "FreeBSD" ]; then \
+	  -$(LDCONFIG) -m $(libdir); \
+	else \
+	  -$(LDCONFIG); \
+	  if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; then \
+	    echo "*************************************************" ; \
+	    echo "*************************************************" ; \
+	    echo "The installed Wine libraries will not be found!" ; \
+	    echo "You can either:" ; 				\
+	    echo "   Add the line '$(libdir)' to /etc/ld.so.conf and run /sbin/ldconfig" ;	\
+	    echo '   export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
+	    echo "*************************************************" ; \
+	    echo "*************************************************" ; \
+	  fi; \
 	fi
 
 uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)



More information about the wine-patches mailing list