--- Makefile.in.orig	Tue Mar  4 03:14:35 2003
+++ Makefile.in	Thu Oct  9 22:07:56 2003
@@ -33,7 +33,7 @@
 srcdir=		@srcdir@
 VPATH=		@srcdir@
 prefix=		@prefix@
-subdirs=        @allsubdirs@ regex # doc -- use rfc2229 instead
+subdirs=        @allsubdirs@ # regex # doc -- use rfc2229 instead
 exec_prefix=	@exec_prefix@
 man1_prefix=	@mandir@/man1
 man8_prefix=	@mandir@/man8
@@ -70,9 +70,9 @@
 
 SCFLAGS=        @SCFLAGS@
 LDFLAGS=        @LDFLAGS@
-XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
+XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
 XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
-LDLIBS=		    @LIBOBJS@ @LIBS@ -Lregex -lregex
+LDLIBS=		    @LIBOBJS@ @LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex
 
 EXES=	 	dict dictd dictzip dictfmt
 
@@ -114,17 +114,7 @@
 all $(EXES)::
 	@for subdir in `echo $(subdirs)`; do \
 		echo making in $$subdir; \
-	 	if [ "$$subdir" = "zlib" ]; then \
-			(cd $$subdir \
-			&& $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
-			|| exit 1; \
-		elif [ "$$subdir" = "regex" ]; then \
-			(cd $$subdir \
-			&& $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
-			|| exit 1; \
-		else \
-			(cd $$subdir && $(MAKE)) || exit 1; \
-		fi; \
+		(cd $$subdir && $(MAKE)) || exit 1; \
 	done
 
 all:: $(EXES) $(LIBRARIES) plugins