diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2011-12-19 11:15:16 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2011-12-19 11:15:16 +0000 |
| commit | 560f1f562ff6f120fe6739d373e5080e3615a61d (patch) | |
| tree | c85a1b5737836849c0d8a6c8647f7a7fc821b9ea /textproc/pdftohtml | |
| parent | 0ff8f6923da97f76985ee176d0b3fd609d40b134 (diff) | |
| download | ports-560f1f562ff6f120fe6739d373e5080e3615a61d.tar.gz ports-560f1f562ff6f120fe6739d373e5080e3615a61d.zip | |
Fix mismerge
Submitted by: Jan Beich <jbeich@tormail.net>
Notes
Notes:
svn path=/head/; revision=287648
Diffstat (limited to 'textproc/pdftohtml')
| -rw-r--r-- | textproc/pdftohtml/files/patch-fofi::Makefile | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/textproc/pdftohtml/files/patch-fofi::Makefile b/textproc/pdftohtml/files/patch-fofi::Makefile index a8c6d4bb721a..e18e6cb2e481 100644 --- a/textproc/pdftohtml/files/patch-fofi::Makefile +++ b/textproc/pdftohtml/files/patch-fofi::Makefile @@ -1,17 +1,14 @@ - -$FreeBSD$ - ---- fofi/Makefile -+++ fofi/Makefile -@@ -14,7 +14,7 @@ +--- fofi/Makefile.orig 2011-12-19 11:57:17.000000000 +0000 ++++ fofi/Makefile 2011-12-19 12:14:09.000000000 +0000 +@@ -14,9 +14,9 @@ GOOSRCDIR = $(srcdir)/../goo
GOOLIBDIR = ../goo
-CXXFLAGS = -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(srcdir)
+CXXFLAGS += -DHAVE_CONFIG_H -I.. -I$(GOOSRCDIR) -I$(srcdir)
- CXX =? g++
+-CXX = g++
++CXX ?= g++
AR = ar rc
- - RANLIB = ranlib - + RANLIB = ranlib
+
|