Description: Makefile: do not add debug information by default on non-native architectures, move that to a new debug target
Author: Johannes 'josch' Schauer <josch@mister-muffin.de>
X-Dgit-Generated: 0.17-2 08ce77321a97c955120ee6994cfdf8c031ea25e6

---

--- botch-0.17.orig/Makefile
+++ botch-0.17/Makefile
@@ -17,7 +17,8 @@ BIN_OPT:= \
   buildcheck-more-problems.native \
   distcheck-more-problems.native
 
-BIN_BYTE:=$(patsubst %.native, %.d.byte, $(BIN_OPT))
+BIN_BYTE:=$(patsubst %.native, %.byte, $(BIN_OPT))
+BIN_DEBUG:=$(patsubst %.native, %.d.byte, $(BIN_OPT))
 BIN_PROF:=$(patsubst %.native, %.p.native, $(BIN_OPT))
 
 BIN_PYTOOLS:=$(patsubst tools/%.py, %, $(filter-out tools/util.py tools/debarch.py,$(wildcard tools/*.py)))
@@ -27,7 +28,7 @@ BIN_SHTOOLS:=$(patsubst tools/%.sh, %, $
 BIN_TOOLS:=$(BIN_PYTOOLS) $(BIN_OCTOOLS) $(BIN_SHTOOLS)
 MANPAGES:=$(patsubst %, doc/man/botch-%.1, $(BIN_TOOLS))
 
-OCAML_BEST ?= $(if $(wildcard /usr/bin/ocamlopt),native,d.byte)
+OCAML_BEST ?= $(if $(wildcard /usr/bin/ocamlopt),native,byte)
 
 PWD := $(shell pwd)
 BUILD = $(PWD)/dose/_build
@@ -67,10 +68,14 @@ all: $(OCAML_BEST) doc
 native: atdgen
 	OCAMLPATH=$(BUILD) ocamlbuild -classic-display -use-ocamlfind $(CFLAGS) $(BIN_OPT)
 
-.PHONY: d.byte
-d.byte: atdgen
+.PHONY: byte
+byte: atdgen
 	OCAMLPATH=$(BUILD) ocamlbuild -classic-display -use-ocamlfind $(CFLAGS) $(BIN_BYTE)
 
+.PHONY: debug
+debug: atdgen
+	OCAMLPATH=$(BUILD) ocamlbuild -classic-display -use-ocamlfind $(CFLAGS) $(BIN_DEBUG)
+
 # profiling for use of native executables with gprof
 .PHONY: profile
 profile: atdgen
@@ -306,7 +311,7 @@ clean:
 	ocamlbuild -clean
 	rm -f datatypes_j.ml datatypes_j.mli datatypes.ml datatypes.mli datatypes_t.ml datatypes_t.mli
 	rm -f tools/*.pyc
-	rm -f *.native *.d.byte
+	rm -f *.native *.byte *.p.native *.d.byte
 	rm -f doc/man/*.1
 	$(MAKE) -C doc/wiki clean
 
--- botch-0.17.orig/_tags
+++ botch-0.17/_tags
@@ -1,3 +1,3 @@
 <**/*.ml{i,}>: debug, package(extlib), package(dose3), package(dose3.doseparseNoRpm), package(atdgen), package(xmlm), package(parmap), pp(cppo)
-<**/*.{cmx,cmo,native,d.byte}>: package(dose3), package(atdgen), package(xmlm), package(dose3.doseparseNoRpm), package(re.pcre), package(parmap)
+<**/*.{cmx,cmo,native,byte}>: package(dose3), package(atdgen), package(xmlm), package(dose3.doseparseNoRpm), package(re.pcre), package(parmap)
 <tests.*>: package(dose3), package(dose3.doseparseNoRpm), package(oUnit)
