--- parser3/src/targets/cgi/Makefile.in	2001/10/24 16:32:07	1.24
+++ parser3/src/targets/cgi/Makefile.in	2002/01/21 16:44:49	1.32
@@ -60,11 +60,13 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 APACHE13 = @APACHE13@
+APACHE_LIBS = @APACHE_LIBS@
 AS = @AS@
 AWK = @AWK@
 CC = @CC@
-CPP_LIBS = @CPP_LIBS@
 CXX = @CXX@
+DB2_INCLUDES = @DB2_INCLUDES@
+DB2_LIBS = @DB2_LIBS@
 DLLTOOL = @DLLTOOL@
 INCLTDL = @INCLTDL@
 LIBADD_DL = @LIBADD_DL@
@@ -73,7 +75,6 @@ LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
-MATH_LIBS = @MATH_LIBS@
 OBJDUMP = @OBJDUMP@
 P3S = @P3S@
 PACKAGE = @PACKAGE@
@@ -83,17 +84,15 @@ XML_INCLUDES = @XML_INCLUDES@
 XML_LIBS = @XML_LIBS@
 YACC = @YACC@
 host_os = @host_os@
-@COMPILE_XML_TRUE@PATCHES_LIBS = ../../classes/xalan-patched/libxalan_patched.a
-@COMPILE_XML_FALSE@PATCHES_LIBS = 
 
-INCLUDES = -I../../classes -I../../types -I$(INCLTDL) -I../../sql @XML_INCLUDES@
+INCLUDES = -I../../classes -I../../types -I$(INCLTDL) -I../../sql -I../../pcre @XML_INCLUDES@
 
 #for sysadmin-controlled auto.p
-CPPFLAGS := $(CPPFLAGS) -DSYSCONFDIR=\"$(sysconfdir)\"
+AM_CPPFLAGS := $(AM_CPPFLAGS) -DSYSCONFDIR=\"$(sysconfdir)\"
 
 bin_PROGRAMS = parser3
 parser3_SOURCES = pa_pool.C pa_threads.C parser3.C ident.C
-parser3_LDADD = ../../main/libmain.a ../../classes/libclasses.a ../../main/libmain.a ../../types/libtypes.a $(LIBLTDL) ../../classes/gd/libgd.a ../../pcre/libpcre.a $(PATCHES_LIBS) @XML_LIBS@
+parser3_LDADD = ../../main/libmain.a ../../classes/libclasses.a ../../main/libmain.a ../../types/libtypes.a $(LIBLTDL) ../../classes/gd/libgd.a ../../classes/xalan-patched/libxalan_patched.a ../../pcre/libpcre.a @XML_LIBS@ @DB2_LIBS@
 
 IDENT_AWK = ../../ident.awk
 IDENT_DEPS = *.C
@@ -104,18 +103,13 @@ PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 parser3_OBJECTS =  pa_pool.o pa_threads.o parser3.o ident.o
-@COMPILE_XML_TRUE@parser3_DEPENDENCIES =  ../../main/libmain.a \
-@COMPILE_XML_TRUE@../../classes/libclasses.a ../../main/libmain.a \
-@COMPILE_XML_TRUE@../../types/libtypes.a ../../classes/gd/libgd.a \
-@COMPILE_XML_TRUE@../../pcre/libpcre.a \
-@COMPILE_XML_TRUE@../../classes/xalan-patched/libxalan_patched.a
-@COMPILE_XML_FALSE@parser3_DEPENDENCIES =  ../../main/libmain.a \
-@COMPILE_XML_FALSE@../../classes/libclasses.a ../../main/libmain.a \
-@COMPILE_XML_FALSE@../../types/libtypes.a ../../classes/gd/libgd.a \
-@COMPILE_XML_FALSE@../../pcre/libpcre.a
+parser3_DEPENDENCIES =  ../../main/libmain.a ../../classes/libclasses.a \
+../../main/libmain.a ../../types/libtypes.a ../../classes/gd/libgd.a \
+../../classes/xalan-patched/libxalan_patched.a ../../pcre/libpcre.a
 parser3_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -127,7 +121,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/ident.P .deps/pa_pool.P .deps/pa_threads.P \
 .deps/parser3.P
@@ -252,7 +246,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pr $$/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \