Upgraded configure script to use autoconf 2.50 features, and renamed

Make.rules.in

@@ -92,7 +92,7 @@ prog_manext     = 1
 conf_manext     = 5
 includedir      = @includedir@/wine
 CLEAN_FILES     = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                  *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h lex.yy.c core
+                  *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
 
 OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
        $(ASM_SRCS:.S=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)

Makefile.in

@@ -151,7 +151,7 @@ clean::
 	$(RM) wine
 
 distclean: clean
-	$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher
+	$(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h include/wine/version.h
 	$(RM) `find . \( -name Makefile -o -size 0 \) -print`
 
 ### Dependencies:

VERSION

+Wine version 20020122

debugger/Makefile.in

@@ -24,14 +24,14 @@ C_SRCS = \
 	winedbg.c
 
 EXTRA_SRCS = dbg.y debug.l
-EXTRA_OBJS = y.tab.o lex.yy.o
+EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
 
 @MAKE_PROG_RULES@
 
 y.tab.c y.tab.h: dbg.y
 	$(YACC) -d -t $(SRCDIR)/dbg.y
 
-lex.yy.c: debug.l
+@LEX_OUTPUT_ROOT@.c: debug.l
 	$(LEX) -8 -I $(SRCDIR)/debug.l
 
 ### Dependencies:

documentation/.cvsignore

@@ -10,5 +10,4 @@ wine-doc
 wine-doc.pdf
 wine-doc.ps
 wine-doc.rtf
-wine.conf.man
 wine.man

documentation/Makefile.in

@@ -44,12 +44,14 @@ BOOK_SRCS = \
 	winelib-toolkit.sgml \
 	winelib-user.sgml
 
+MAN_TARGETS = wine.man
+
 BOOK_TARGETS = \
 	$(BOOKNAME)/index.html \
 	$(BOOKNAME).pdf \
 	$(BOOKNAME).ps
 
-all: $(BOOK_TARGETS)
+all: $(MAN_TARGETS) $(BOOK_TARGETS)
 
 @MAKE_RULES@
 
@@ -62,14 +64,15 @@ $(BOOKNAME).pdf: $(BOOK_SRCS)
 $(BOOKNAME).ps: $(BOOK_SRCS)
 	db2ps $(BOOKNAME).sgml > /dev/null
 
-install:: 
+wine.man: wine.man.in
+	sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' $(SRCDIR)/wine.man.in >wine.man
+
+install:: $(MAN_TARGETS)
 	$(INSTALL) -d $(mandir)/man$(prog_manext)
 	$(INSTALL) -d $(mandir)/man$(conf_manext)
-	sed -e 's|$${prefix}|$(prefix)|g' < wine.man > wine.man.tmp && mv wine.man.tmp wine.man
 	$(INSTALL_DATA) wine.man $(mandir)/man$(prog_manext)/wine.$(prog_manext)
 	$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
-	sed -e 's|$${prefix}|$(prefix)|g' < wine.conf.man > wine.conf.man.tmp && mv wine.conf.man.tmp wine.conf.man
-	$(INSTALL_DATA) wine.conf.man $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
+	$(INSTALL_DATA) $(SRCDIR)/wine.conf.man $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
 
 uninstall::
 	$(RM) $(mandir)/man$(prog_manext)/wine.$(prog_manext)
@@ -77,7 +80,7 @@ uninstall::
 	$(RM) $(mandir)/man$(conf_manext)/wine.conf.$(conf_manext)
 
 clean::
-	$(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps
+	$(RM) *.aux *.dvi *.out *.pdf *.ps *.tex *.log $(BOOKNAME).pdf $(BOOKNAME).ps $(MAN_TARGETS)
 	$(RM) -r $(BOOKNAME) html man3w *.junk DBTOHTML_OUTPUT_DIR*
 
 ### Dependencies:

documentation/wine.man.in

@@ -357,35 +357,32 @@ development, you might want to subscribe to the
 .SH FILES
 .PD 0
 .TP
-.I @prefix@/bin/wine
+.I @bindir@/wine
 The 
 .B wine 
 program loader.
 .TP
-.I @prefix@/bin/wineconsole
+.I @bindir@/wineconsole
 The 
 .B wine 
 program loader for CUI (console) applications.
 .TP
-.I @prefix@/bin/dosmod
-The DOS program loader.
-.TP
-.I @prefix@/bin/wineserver
+.I @bindir@/wineserver
 The 
 .B wine 
 server 
 .TP 
-.I @prefix@/bin/winedbg
+.I @bindir@/winedbg
 The 
 .B wine 
 debugger
 .TP 
-.I @prefix@/bin/wineclpsrv
+.I @bindir@/wineclpsrv
 The 
 .B wine 
 clipboard server
 .TP 
-.I @prefix@/lib/
+.I @libdir@
 Directory containing 
 .B wine's
 shared libraries 

include/version.h

-#define WINE_RELEASE_INFO "Wine release 20020122"

include/wine/.cvsignore

+version.h

programs/winhelp/Makefile.in

@@ -13,7 +13,7 @@ C_SRCS = \
 	string.c
 
 EXTRA_SRCS = macro.yacc.y macro.lex.l
-EXTRA_OBJS = y.tab.o lex.yy.o
+EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
 
 RC_SRCS = rsrc.rc
 
@@ -33,7 +33,7 @@ uninstall::
 y.tab.c y.tab.h: macro.yacc.y
 	$(YACC) -d -t $(SRCDIR)/macro.yacc.y
 
-lex.yy.c: macro.lex.l
+@LEX_OUTPUT_ROOT@.c: macro.lex.l
 	$(LEX) -8 -i $(SRCDIR)/macro.lex.l
 
 ### Dependencies:

tools/Makefile.in

-DEFS      = -D__WINE__
+DEFS      = -D__WINE__ -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\"" 
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 
-PROGRAMS = makedep fnt2bdf bin2res
+PROGRAMS = makedep fnt2bdf bin2res winelauncher
 MODULE   = none
 
 C_SRCS = makedep.c fnt2bdf.c bin2res.c
@@ -40,6 +40,9 @@ fnt2bdf: fnt2bdf.o
 bin2res: bin2res.o
 	$(CC) $(CFLAGS) -o bin2res bin2res.o
 
+winelauncher: winelauncher.in
+	sed -e 's,@bindir\@,$(bindir),g' -e 's,@libdir\@,$(libdir),g' $(SRCDIR)/winelauncher.in >winelauncher
+
 install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__)
 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
 	$(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf

tools/makedep.c

@@ -324,7 +324,7 @@ static void output_src( FILE *file, INCL_FILE *pFile, int *column )
         }
         else if (!strcmp( ext, "l" ))  /* lex file */
         {
-            *column += fprintf( file, "lex.yy.o: lex.yy.c" );
+            *column += fprintf( file, "%s.o: %s.c", LEX_OUTPUT_ROOT, LEX_OUTPUT_ROOT );
         }
         else if (!strcmp( ext, "rc" ))  /* resource file */
         {

tools/winelauncher.in

@@ -19,14 +19,8 @@
 
 #------------------------------------------------------------------------------
 #  Primary configuration area - change this if you installed Wine to
-#    a location other than @prefix@
+#    a different location
 #------------------------------------------------------------------------------
-prefix=@prefix@
-
-#------------------------------------------------------------------------------
-#  Secondary configuration area; change these at your own risk.
-#------------------------------------------------------------------------------
-exec_prefix=@exec_prefix@
 WINEBIN=@bindir@
 WINELIB=@libdir@
 WINESERVER=

tools/wrc/Makefile.in

@@ -21,7 +21,7 @@ C_SRCS = \
 
 GEN_C_SRCS = ppy.tab.c lex.ppl.c
 EXTRA_SRCS = parser.y parser.l
-EXTRA_OBJS = y.tab.o lex.yy.o
+EXTRA_OBJS = y.tab.o @LEX_OUTPUT_ROOT@.o
 
 all: $(PROGRAMS)
 
@@ -39,7 +39,7 @@ y.tab.c y.tab.h: parser.y
 ppy.tab.c ppy.tab.h: ppy.y
 	$(YACC) $(YACCOPT) -bppy -ppp -d -t $(SRCDIR)/ppy.y
 
-lex.yy.c: parser.l
+@LEX_OUTPUT_ROOT@.c: parser.l
 	$(LEX) $(LEXOPT) -d -8 $(SRCDIR)/parser.l
 
 lex.ppl.c: ppl.l