summaryrefslogtreecommitdiff
path: root/textproc/catdoc/patches/patch-ac
blob: 5e2b167419855971237a57c0272c328dad27e686 (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
$NetBSD: patch-ac,v 1.5 2006/10/01 08:58:24 schwarz Exp $

--- src/Makefile.in.orig	1999-12-30 15:24:10.000000000 +0100
+++ src/Makefile.in	2006-09-21 00:20:08.000000000 +0200
@@ -18,7 +18,7 @@
 install_targets = @installtargets@
 # Flags to pass to your C compilier
 # remove -O2 on HP/UX 9. It is known to cause problems
-FLAGS=-Wall -O2 -g 
+#FLAGS=-Wall -O2 -g 
 
 #Compile-time configuration of catdoc itself. Edit according to taste
 
@@ -61,19 +61,19 @@
  -DREPL_EXT=\"$(REPL_EXT)\" -DUNKNOWN_CHAR=\'$(UNKNOWN_CHAR)\'\
  -DSOURCE_CHARSET=\"$(SOURCE_CHARSET)\" -DTARGET_CHARSET=\"$(TARGET_CHARSET)\"
 
-CFLAGS=$(FLAGS) $(DEFINES) @DEFS@
+FLAGS=$(CFLAGS) $(DEFINES) @DEFS@ $(CPPFLAGS)
 OBJ=catdoc.o charsets.o substmap.o reader.o writer.o fileutil.o\
 	confutil.o analyze.o rtfreader.o
 
 OBJXLS=xls2csv.o charsets.o substmap.o fileutil.o confutil.o
 
 #.c.o:
-#	$(CC) -c $(CFLAGS) $*
+#	$(CC) -c $(FLAGS) $*
 all: @buildtargets@
 catdoc: $(OBJ)
-	$(CC)  -o catdoc  $(OBJ)
+	$(CC)  -o catdoc  $(OBJ) @LIBS@
 xls2csv: $(OBJXLS)
-	$(CC) -o xls2csv $(OBJXLS) -lm
+	$(CC) -o xls2csv $(OBJXLS) -lm @LIBS@
 install: @installtargets@
 install-catdoc:catdoc xls2csv
 	../mkinstalldirs $(installroot)$(bindir)