diff --git a/configure b/configure index 21bb50ebe72757cc3e85b42092782fdd142f79fa..c54b15b8c759afbc7d951d6b342fcf4c57a59b76 100755 --- a/configure +++ b/configure @@ -5266,6 +5266,7 @@ dlls/winaspi/Makefile dlls/winspool/Makefile dlls/wnaspi32/Makefile documentation/Makefile +documentation/wine.man files/Makefile graphics/Makefile graphics/enhmetafiledrv/Makefile @@ -5434,6 +5435,7 @@ dlls/winaspi/Makefile dlls/winspool/Makefile dlls/wnaspi32/Makefile documentation/Makefile +documentation/wine.man files/Makefile graphics/Makefile graphics/enhmetafiledrv/Makefile diff --git a/configure.in b/configure.in index 86fce1d7ba6a51c62ddcb33b26adfab529fe8ebb..0d99cca2f177ac42881041d86cf944195f68defa 100644 --- a/configure.in +++ b/configure.in @@ -768,6 +768,7 @@ dlls/winaspi/Makefile dlls/winspool/Makefile dlls/wnaspi32/Makefile documentation/Makefile +documentation/wine.man files/Makefile graphics/Makefile graphics/enhmetafiledrv/Makefile diff --git a/documentation/.cvsignore b/documentation/.cvsignore index f3c7a7c5da68804a1bdf391127ba34aed33c3cca..e66451a343fe755de1860e5bca60bd17fbaba647 100644 --- a/documentation/.cvsignore +++ b/documentation/.cvsignore @@ -1 +1,2 @@ Makefile +wine.man diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 5e1e589160309a2eeda7912356f0f6655eea1f4f..e3766549767d7f7566a2a6a6926155de56f7e289 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -68,7 +68,7 @@ clean:: $(RM) $(INFOFILES) $(DVIFILES) $(INCLUDES) $(RM) wine.aux wine.cp wine.cps wine.fn wine.fns wine.ky wine.log \ wine.pg wine.toc wine.tp wine.tps wine.vr wine.vrs \ - wine.texi + wine.texi wine.man $(RM) -r man3w ### Dependencies: diff --git a/documentation/wine.man b/documentation/wine.man.in similarity index 94% rename from documentation/wine.man rename to documentation/wine.man.in index 89c710fa4b5e73a5e6de37edcdc0e34cd105d42d..53a9a98faf2e62a564b185d75e6b41d1093383c8 100644 --- a/documentation/wine.man +++ b/documentation/wine.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINE 1 "April 26, 1999" "Version 990328" "Windows On Unix" +.TH WINE 1 "June 1, 1999" "Version 990523" "Windows On Unix" .SH NAME wine \- run Windows programs on Unix .SH SYNOPSIS @@ -16,10 +16,10 @@ loads and runs the given program, where the program is a DOS, Windows 3.x, or Win32 executable. .PP .B wine -currently runs a growing list of applications written for both Win3.1 and -Win95. Older, simpler applications work better than newer, more complex -ones. A large percentage of the API has been implemented, although there -are still several major pieces of work left to do. +currently runs a growing list of applications written for Win3.1, +Win95, Win95, and Windows NT. Older, simpler applications work better than +newer, more complex ones. A large percentage of the API has been implemented, +although there are still several major pieces of work left to do. .SH REQUIREMENTS .B wine requires kernel-level threads to run. Currently, only Linux version 2.0 @@ -80,7 +80,8 @@ detect your specific setup and create the Makefiles. You can run .B wine executable, and then "make install" to install it. By default, .B wine -is installed in the /usr/local/ heirarchy; you can specify a different path with +is installed in the /usr/local/ hierarchy (current configuration has it in +the @prefix@ hierarchy); you can specify a different path with the --prefix option when running .B configure. .PP @@ -94,7 +95,7 @@ Turn on backing store .TP .I -config filename Use the named configuration file rather than the default -(/usr/local/etc/wine.conf or ~/.winerc). +(@sysconfdir@/wine.conf or ~/.winerc). .TP .I -debug Enter the debugger before starting application @@ -165,8 +166,8 @@ Use the specified display .TP .I -dll name[,name[,...]]={native|elfdll|so|builtin}[,{n|e|s|b}[,...]][:...] Selects the override type and load order of dll used in the loading process -for any dll. The default is set in wine.conf or ~/.winerc. There are -currently four types of libraries that can be loaded into a process' address +for any dll. The default is set in @sysconfdir@/wine.conf or ~/.winerc. There +are currently four types of libraries that can be loaded into a process' address space: Native windows dlls ( .I native ), ELF encapsulated windows dlls ( @@ -261,11 +262,11 @@ by placing all of them on the command line (such as: wine notepad clock). .SH CONFIGURATION FILE .B wine expects a configuration file ( -.I /usr/local/etc/wine.conf +.I @sysconfdir@/wine.conf ), which should conform to the following rules (the format is just like a Windows .ini -file). The actual file name may be specified during the execution of -the +file). The actual directory where that file resides may be specified during +the execution of the .B configure script with the --sysconfdir option. Alternatively, you may have a .I .winerc @@ -391,7 +392,7 @@ debugger. .PP .B [DllDefaults] .br -.I format: EXTRA_LD_LIBRARY_PATH=/usr/local/lib/wine[:/more/path/to/search[:...]] +.I format: EXTRA_LD_LIBRARY_PATH=@prefix@/lib/wine[:/more/path/to/search[:...]] .br The path will be appended to any existing LD_LIBRARY_PATH from the environment for the search of elfdlls and .so libraries. @@ -560,19 +561,19 @@ All discussions about the project take place in this forum. .SH FILES .PD 0 .TP -.I /usr/local/bin/wine +.I @prefix@/bin/wine The Wine program loader. .TP -.I /usr/local/bin/dosmod +.I @prefix@/bin/dosmod The DOS program loader. .TP -.I /usr/local/etc/wine.conf +.I @sysconfdir@/wine.conf Global configuration file for wine. .TP .I ~/.winerc User-specific configuration file .TP -.I /usr/local/lib/wine.sym +.I @prefix@/lib/wine.sym Global symbol table (used in debugger) .SH "SEE ALSO" .BR clone (2)