Commit 088a76b8 authored by Moses DeJong's avatar Moses DeJong Committed by Alexandre Julliard

Fixed missing libwine.so symlink during install. Set the runtime

linker path.
parent e6b82e76
...@@ -271,7 +271,8 @@ llib-lwine.ln : $(LIBLINTS) $(X11LINTS) ...@@ -271,7 +271,8 @@ llib-lwine.ln : $(LIBLINTS) $(X11LINTS)
libwine.so.1.0: $(LIBOBJS) $(X11OBJS) libwine.so.1.0: $(LIBOBJS) $(X11OBJS)
$(LDSHARED) -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS) $(LDSHARED) -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS)
ln -sf $@ libwine.so $(RM) libwine.so
$(LN_S) $@ libwine.so
install_emu: install_lib install_emu: install_lib
[ -d $(bindir) ] || $(MKDIR) $(bindir) [ -d $(bindir) ] || $(MKDIR) $(bindir)
...@@ -285,8 +286,12 @@ install_lib: dummy ...@@ -285,8 +286,12 @@ install_lib: dummy
[ -d $(libdir) ] || $(MKDIR) $(libdir) [ -d $(libdir) ] || $(MKDIR) $(libdir)
if [ -f wine.sym ]; then $(INSTALL_DATA) wine.sym $(libdir)/wine.sym; fi if [ -f wine.sym ]; then $(INSTALL_DATA) wine.sym $(libdir)/wine.sym; fi
if [ $(LIB_TARGET) ]; then \ if [ $(LIB_TARGET) ]; then \
if [ $(LIB_TARGET) = libwine.so.1.0 ]; then \
$(INSTALL_PROGRAM) $(LIB_TARGET) $(libdir); \
$(LDCONFIG) || (cd $(libdir) ; $(RM) libwine.so ; $(LN_S) $(LIB_TARGET) libwine.so) ; \
else \
$(INSTALL_DATA) $(LIB_TARGET) $(libdir); \ $(INSTALL_DATA) $(LIB_TARGET) $(libdir); \
if [ $(LIB_TARGET) = libwine.so.1.0 ]; then $(LDCONFIG); fi \ fi \
fi fi
[ -d $(bindir) ] || $(MKDIR) $(bindir) [ -d $(bindir) ] || $(MKDIR) $(bindir)
$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver $(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
......
...@@ -4119,7 +4119,7 @@ echo "$ac_t""$ac_cv_c_dll_linux" 1>&6 ...@@ -4119,7 +4119,7 @@ echo "$ac_t""$ac_cv_c_dll_linux" 1>&6
then then
BUILDFLAGS="-pic" BUILDFLAGS="-pic"
DLLFLAGS="-fPIC" DLLFLAGS="-fPIC"
LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so" LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so,-rpath,\$(libdir)"
else else
echo $ac_n "checking "whether we can build a UnixWare dll"""... $ac_c" 1>&6 echo $ac_n "checking "whether we can build a UnixWare dll"""... $ac_c" 1>&6
echo "configure:4126: checking "whether we can build a UnixWare dll"" >&5 echo "configure:4126: checking "whether we can build a UnixWare dll"" >&5
...@@ -4155,7 +4155,7 @@ echo "$ac_t""$ac_cv_c_dll_unixware" 1>&6 ...@@ -4155,7 +4155,7 @@ echo "$ac_t""$ac_cv_c_dll_unixware" 1>&6
then then
BUILDFLAGS="-pic" BUILDFLAGS="-pic"
DLLFLAGS="-fPIC" DLLFLAGS="-fPIC"
LDSHARED="\$(CC) -Wl,-G,-h,/usr/local/lib/libwine.so" LDSHARED="\$(CC) -Wl,-G,-h,\$(libdir)/libwine.so"
else else
echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6 echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6
echo "configure:4162: checking "whether we can build a NetBSD dll"" >&5 echo "configure:4162: checking "whether we can build a NetBSD dll"" >&5
......
...@@ -356,7 +356,7 @@ then ...@@ -356,7 +356,7 @@ then
then then
BUILDFLAGS="-pic" BUILDFLAGS="-pic"
DLLFLAGS="-fPIC" DLLFLAGS="-fPIC"
LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so" LDSHARED="\$(CC) -shared -Wl,-soname,libwine.so,-rpath,\$(libdir)"
else else
AC_CACHE_CHECK("whether we can build a UnixWare dll", AC_CACHE_CHECK("whether we can build a UnixWare dll",
ac_cv_c_dll_unixware, ac_cv_c_dll_unixware,
...@@ -369,7 +369,7 @@ then ...@@ -369,7 +369,7 @@ then
then then
BUILDFLAGS="-pic" BUILDFLAGS="-pic"
DLLFLAGS="-fPIC" DLLFLAGS="-fPIC"
LDSHARED="\$(CC) -Wl,-G,-h,/usr/local/lib/libwine.so" LDSHARED="\$(CC) -Wl,-G,-h,\$(libdir)/libwine.so"
else else
AC_CACHE_CHECK("whether we can build a NetBSD dll", AC_CACHE_CHECK("whether we can build a NetBSD dll",
ac_cv_c_dll_netbsd, ac_cv_c_dll_netbsd,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment