mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 06:40:38 +00:00
Install the wine server in $(bindir) and exec it from there.
This commit is contained in:
parent
c61eb035e3
commit
9103daf300
|
@ -280,10 +280,12 @@ install_lib: dummy
|
|||
if [ $(LIB_TARGET) = libwine.so.1.0 ]; then $(LDCONFIG); fi \
|
||||
fi
|
||||
[ -d $(bindir) ] || $(MKDIR) $(bindir)
|
||||
$(INSTALL_PROGRAM) server/wineserver $(bindir)/wineserver
|
||||
$(INSTALL_PROGRAM) windows/x11drv/wineclipsrv $(bindir)/wineclipsrv
|
||||
|
||||
uninstall_lib: dummy
|
||||
cd $(libdir); $(RM) $(LIB_TARGET) libwine.a libwine.so wine.sym
|
||||
cd $(libdir) && $(RM) $(LIB_TARGET) libwine.a libwine.so wine.sym
|
||||
$(RM) $(bindir)/wineserver $(bindir)/wineclipsrv
|
||||
|
||||
$(X11OBJS) $(EMUOBJS) $(LIBOBJS): $(TOOLSUBDIRS) dummy
|
||||
@cd `dirname $@`; $(SUBMAKE)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
DEFS = @DLLFLAGS@ -D__WINE__
|
||||
DEFS = @DLLFLAGS@ -D__WINE__ -DBINDIR="\"$(bindir)\""
|
||||
TOPSRCDIR = @top_srcdir@
|
||||
TOPOBJDIR = ..
|
||||
SRCDIR = @srcdir@
|
||||
|
|
|
@ -289,12 +289,9 @@ int CLIENT_InitServer(void)
|
|||
default: /* parent */
|
||||
close( fd[0] );
|
||||
sprintf( buffer, "%d", fd[1] );
|
||||
/*#define EXEC_SERVER*/
|
||||
#ifdef EXEC_SERVER
|
||||
execl( BINDIR "/wineserver", "wineserver", buffer, NULL );
|
||||
execlp( "wineserver", "wineserver", buffer, NULL );
|
||||
execl( "/usr/local/bin/wineserver", "wineserver", buffer, NULL );
|
||||
execl( "./server/wineserver", "wineserver", buffer, NULL );
|
||||
#endif
|
||||
create_initial_thread( fd[1] );
|
||||
exit(0);
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ int main( int argc, char *argv[] )
|
|||
/* make sure the fd is valid */
|
||||
if (fcntl( fd, F_GETFL, 0 ) == -1) goto error;
|
||||
|
||||
debug_level = 1;
|
||||
/* debug_level = 1; */
|
||||
|
||||
if (debug_level) fprintf( stderr, "Server: starting (pid=%ld)\n", (long) getpid() );
|
||||
create_initial_thread( fd );
|
||||
|
|
Loading…
Reference in a new issue