PERFORCE change 117361 for review

[Oleksandr Tymoshenko]

http://perforce.freebsd.org/chv.cgi?CH=117361

Change 117361 by gonzo at gonzo_jeeves on 2007/04/04 15:10:43

	o Resolve conflict: still "NO GDB" for mips

Affected files ...

.. //depot/projects/mips2/src/gnu/usr.bin/Makefile#4 edit

Differences ...

==== //depot/projects/mips2/src/gnu/usr.bin/Makefile#4 (text+ko) ====

@@ -23,19 +23,10 @@
 	sort \
 	${_texinfo}
  
->>>> ORIGINAL Makefile#35
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_ARCH} == "mips"
 MK_GDB=	no	# not yet
 .endif
 
-==== THEIRS Makefile#39
-==== YOURS Makefile
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" || \
-	${MACHINE_ARCH} == "mips"
-MK_GDB=	no	# not yet
-.endif
-
-<<<<
 .if ${MK_CXX} != "no"
 _gperf=		gperf
 .if ${MK_GROFF} != "no"