Applied most patches from Debian package. Rewrote configure to work with modern autoc...

[oss/catdoc.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index ef4f417d309efef97ea7b9e863080e7033c47cd7..8884f61a689962485b613932875bb5ff300157f5 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -12,6 +12,7 @@ bindir = @bindir@
 libdir = @libdir@
 confdir = @sysconfdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 mandir = @mandir@
 INSTALL = @INSTALL@
 WISH = @WISH@
@@ -22,7 +23,7 @@ install_targets = @installtargets@
 CHARSETPATH=${datadir}/catdoc
 # Flags to pass to your C compilier
 # remove -O2 on HP/UX 9. It is known to cause problems
-FLAGS=-I. @CFLAGS@  @DEFS@ -DCATDOC_VERSION=\"@catdoc_version@\" -DCHARSETPATH=\"${CHARSETPATH}\"
+FLAGS=-I. @CFLAGS@  @DEFS@ -DCATDOC_VERSION=\"@PACKAGE_VERSION@\" -DCHARSETPATH=\"${CHARSETPATH}\"
 
 #Compile-time configuration of catdoc itself. Edit according to taste
 
@@ -74,12 +75,12 @@ OBJPPT=catppt.o pptparse.o $(COMMONOBJ)
 #      $(CC) -c $(CFLAGS) $*
 all: @buildtargets@
 catdoc: $(OBJ)
-       $(CC)  -o catdoc  $(OBJ)
+       $(CC)  -o catdoc  $(OBJ) $(LDFLAGS)
 xls2csv: $(OBJXLS)
-       $(CC) -o xls2csv $(OBJXLS) -lm
+       $(CC) -o xls2csv $(OBJXLS) -lm $(LDFLAGS)
 
 catppt: $(OBJPPT)
-       $(CC) -o catppt $(OBJPPT) -lm
+       $(CC) -o catppt $(OBJPPT) -lm $(LDFLAGS)
 
 install: @installtargets@
 install-catdoc:catdoc xls2csv catppt