To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=46507
                  Issue #:|46507
                  Summary:|bad merge:
                          |connectivity/source/drivers/mozab/makefile.mk
                Component:|tools
                  Version:|1.0.0
                 Platform:|All
                      URL:|
               OS/Version:|All
                   Status:|NEW
        Status whiteboard:|
                 Keywords:|
               Resolution:|
               Issue type:|DEFECT
                 Priority:|P3
             Subcomponent:|code
              Assigned to:|rt
              Reported by:|pjanik





------- Additional comments from [EMAIL PROTECTED] Fri Apr  1 08:15:34 -0800 
2005 -------
The file connectivity/source/drivers/mozab/makefile.mk seems to be incorrectly
merged:

Index: makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/makefile.mk,v
retrieving revision 1.17
diff -u -u -r1.17 makefile.mk
--- makefile.mk 30 Mar 2005 11:34:45 -0000      1.17
+++ makefile.mk 1 Apr 2005 16:14:24 -0000
@@ -65,7 +65,7 @@
 TARGET=$(MOZAB_TARGET)
 TARGET2=$(MOZAB_TARGET)drv
 
-.IF  "$(.IF  "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" &&
"$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
+.IF  "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)"
== "YES") || "$(WITH_MOZILLA)" == "NO"
 all: 
        @echo "         Not building the mozabsrc stuff in OpenOffice.org build"
        @echo "         dependency to Mozilla developer snapshots not feasable 
at the moment"

---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to