Author: pfg
Date: Fri Jan 13 16:20:00 2017
New Revision: 1778625

URL: http://svn.apache.org/viewvc?rev=1778625&view=rev
Log:
FreeBSD PPC: Cleanup makefile include mess.

Reported by:    Curtis Hamilton

Modified:
    openoffice/trunk/main/solenv/inc/unx.mk
    openoffice/trunk/main/solenv/inc/unxfbsd.mk

Modified: openoffice/trunk/main/solenv/inc/unx.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unx.mk?rev=1778625&r1=1778624&r2=1778625&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unx.mk (original)
+++ openoffice/trunk/main/solenv/inc/unx.mk Fri Jan 13 16:20:00 2017
@@ -91,14 +91,6 @@
 .INCLUDE : unxlngppc.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64"
-.INCLUDE : unxlngppc64.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCFREEBSDPPOWERPC64"
-.INCLUDE : unxfbsdp.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
 .INCLUDE : unxlngs390.mk
 .ENDIF
@@ -115,6 +107,11 @@
 .INCLUDE : unxlnga.mk
 .ENDIF
 
+# FreeBSD includes the specific platforms in its makefile
+.IF "$(OS)" == "FREEBSD"
+.INCLUDE : unxfbsd.mk
+.ENDIF
+
 .IF "$(COM)$(OS)$(CPU)" == "ACCHPUXR"
 .INCLUDE : unxhpxr.mk
 .ENDIF
@@ -143,10 +140,6 @@
 .INCLUDE : unxbsds.mk
 .ENDIF
 
-.IF "$(OS)" == "FREEBSD"
-.INCLUDE : unxfbsd.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 .INCLUDE : unxmacxp.mk
 .ENDIF

Modified: openoffice/trunk/main/solenv/inc/unxfbsd.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsd.mk?rev=1778625&r1=1778624&r2=1778625&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxfbsd.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxfbsd.mk Fri Jan 13 16:20:00 2017
@@ -38,14 +38,11 @@ JAVAFLAGSDEBUG=-g
 .INCLUDE : unxfbsdx.mk
 .ENDIF
 .IF "$(CPUNAME)" == "POWERPC64"
-.INCLUDE : unxfbsdp.mk
+.INCLUDE : unxfbsdppc64.mk
 .ENDIF
 .IF "$(CPUNAME)" == "POWERPC"
 .INCLUDE : unxfbsdppc.mk
 .ENDIF
-.IF "$(CPUNAME)" == "POWERPC64"
-.INCLUDE : unxfbsdppc64.mk
-.ENDIF
 .IF "$(CPUNAME)" == "ARM"
 .INCLUDE : unxfbsdr.mk
 .ENDIF


Reply via email to