--- psiconv/trunk/lib/psiconv/Makefile.in	2000/12/10 16:13:24	57
+++ psiconv/trunk/lib/psiconv/Makefile.in	2000/12/10 16:49:40	58
@@ -38,7 +38,7 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ..
+top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -76,27 +76,27 @@
 VERSION = @VERSION@
 cflags_set = @cflags_set@
 
-INCLUDES = -I.. -I../compat
+INCLUDES = -I.. -I../../compat
 
 lib_LTLIBRARIES = libpsiconv.la
 libpsiconv_la_SOURCES = checkuid.c data.c                         list.c parse_aux.c parse_common.c parse_driver.c                         parse_layout.c parse_image.c parse_page.c                          parse_simple.c parse_texted.c parse_word.c 
 
 libpsiconv_la_LDFLAGS = -version-info 4:0:0
-libpsiconv_la_LIBADD = ../compat/libcompat.la
+libpsiconv_la_LIBADD = ../../compat/libcompat.la
 
 psiconvincludedir = $(includedir)/psiconv
 psiconvinclude_HEADERS = data.h parse.h list.h parse_routines.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
+CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES =  general.h
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I../..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libpsiconv_la_DEPENDENCIES =  ../compat/libcompat.la
+libpsiconv_la_DEPENDENCIES =  ../../compat/libcompat.la
 libpsiconv_la_OBJECTS =  checkuid.lo data.lo list.lo parse_aux.lo \
 parse_common.lo parse_driver.lo parse_layout.lo parse_image.lo \
 parse_page.lo parse_simple.lo parse_texted.lo parse_word.lo
@@ -125,7 +125,7 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/psiconv/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
@@ -240,14 +240,14 @@
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = lib
+subdir = lib/psiconv
 
 distdir: $(DISTFILES)
 	here=`cd $(top_builddir) && pwd`; \
 	top_distdir=`cd $(top_distdir) && pwd`; \
 	distdir=`cd $(distdir) && pwd`; \
 	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/psiconv/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \