diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:20:14 +0000 |
| commit | b0bdc9e3950e7e1e4cd0b1e6601da7744ecccf08 (patch) | |
| tree | a0ef43a85df03df285cd86aa66c5c4b2477af0cc /editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk | |
| parent | 643_OO did not get tagged for the ${cc} -> ${CC} change. (diff) | |
Add merged patches which conflicted.
Notes
Notes:
svn path=/head/; revision=68622
Diffstat (limited to 'editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk')
| -rw-r--r-- | editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk index f422040f99d4..f99a49c36067 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk +++ b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+makefile.mk @@ -1,12 +1,12 @@ ---- ../connectivity/source/drivers/mozab/makefile.mk.orig Wed Jun 12 01:37:30 2002 -+++ ../connectivity/source/drivers/mozab/makefile.mk Wed Jun 12 01:37:47 2002 -@@ -107,9 +107,7 @@ +--- ../connectivity/source/drivers/mozab/makefile.mk.orig Mon Aug 19 19:23:47 2002 ++++ ../connectivity/source/drivers/mozab/makefile.mk Wed Oct 16 00:01:36 2002 +@@ -167,7 +167,9 @@ + # --- MOZAB BASE Library ----------------------------------- - SHL1VERSIONMAP= $(TARGET).map --.IF "$(OS)"!="FREEBSD" - SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) --.ENDIF - SHL1OBJS=$(SLOFILES) - SHL1STDLIBS=\ - $(CPPULIB) \ ++.IF "$(OS)"!="FREEBSD" + SHL2VERSIONMAP= $(TARGET2).map ++.ENDIF + SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR) + SHL2OBJS=$(SLO2FILES) + SHL2STDLIBS=\ |