$NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $

--- Makefile.in.orig	Thu Dec 16 10:52:20 1999
+++ Makefile.in	Fri Aug  4 21:37:11 2000
@@ -76,7 +76,7 @@
 
 VPATH = @srcdir@
 
-CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/  @TTF_CFLAGS@ @WMF_CFLAGS@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(libdir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(libdir)/wv/wvHtml.xml\" 
+CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" @CPPFLAGS@
 
 MKINSTALLDIRS = $(srcdir)/mkinstalldirs
 
@@ -223,7 +223,7 @@
 wv-incconfig: Makefile
 	rm -f wv-incconfig
 	echo \#\!/bin/sh > wv-incconfig
-	echo echo @ZLIB_CFLAGS@ -I$(includedir) @WMF_CFLAGS@ >> wv-incconfig
+	echo echo @WMF_CFLAGS@ @ZLIB_CFLAGS@ -I$(includedir) >> wv-incconfig
 
 lex.yy.c: parser.lex
 	$(LEX) parser.lex
@@ -293,10 +293,11 @@
 	$(mandir) \
 	$(mandir)/man1 \
 	$(libdir) \
-	$(libdir)/wv\
-	$(libdir)/wv/wingdingfont \
-	$(libdir)/wv/patterns \
-	$(libdir)/wv/ttf \
+	$(prefix)/share/wv\
+	$(prefix)/share/wv/wingdingfont \
+	$(prefix)/share/wv/patterns \
+	$(prefix)/share/wv/ttf \
+	$(prefix)/share/wv \
 	$(includedir)
 	
 
@@ -313,13 +314,16 @@
 	$(INSTALL_DATA) $(srcdir)/wvHtml.1 $(mandir)/man1/
 	$(INSTALL_DATA) wv.h $(includedir)/wv.h
 	$(INSTALL_DATA) $(srcdir)/libwv.a $(libdir)/libwv.a
-	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(libdir)/wv/wvHtml.xml
-	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(libdir)/wv/wvConfig.xml
+	$(INSTALL_DATA) $(srcdir)/lyx.xml $(prefix)/share/wv/lyx.xml
+	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
+	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
+	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
+	$(INSTALL_DATA) $(srcdir)/wvOnline.xml $(prefix)/share/wv/wvOnline.xml
 	for filename in wingdingfont/*.gif; do \
-		$(INSTALL_DATA) $$filename $(libdir)/wv/wingdingfont; \
+		$(INSTALL_DATA) $$filename $(prefix)/share/wv/wingdingfont; \
 	done
 	for filename in patterns/*.gif patterns/*.jpg; do \
-		$(INSTALL_DATA) $$filename $(libdir)/wv/patterns; \
+		$(INSTALL_DATA) $$filename $(prefix)/share/wv/patterns; \
 	done