summaryrefslogtreecommitdiff
path: root/converters/wv/patches/patch-aa
blob: 8c73e40d25d2f2a1dcbbeb795a555534d8d45a4a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
$NetBSD: patch-aa,v 1.3 2000/10/16 15:14:23 rh Exp $

--- Makefile.in.orig	Wed Sep 20 20:42:43 2000
+++ Makefile.in
@@ -76,7 +76,7 @@
 
 VPATH = @srcdir@
 
-CFLAGS = @CFLAGS@ @DEFS@ @ZLIB_CFLAGS@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/getopt-wv/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ @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)/getopt-wv/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" 
 
 CFLAGS += \
 	-I$(srcdir)/libole2/ \
@@ -237,7 +237,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
@@ -325,10 +325,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)
 	
 
@@ -366,15 +367,15 @@
 	$(INSTALL_DATA) $(srcdir)/wvSummary.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)/wvLaTeX.xml $(libdir)/wv/wvLaTeX.xml
-	$(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(libdir)/wv/wvCleanLaTeX.xml
-	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(libdir)/wv/wvConfig.xml
+	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
+	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
+	$(INSTALL_DATA) $(srcdir)/wvCleanLaTeX.xml $(prefix)/share/wv/wvCleanLaTeX.xml
+	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.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