diff --git a/Makefile b/Makefile index 3d29625e32f3c630f047aa4ea1357f8819b75b50..185c1dc058ec607076b2ebc60bfd29480bc776d3 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ export CXXFLAGS = -Wall -O2 -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES) export LIBS = -lz export BT_ROOT = src/utils/BamTools/ +prefix = /usr/local + SUBDIRS = $(SRC_DIR)/annotateBed \ $(SRC_DIR)/bamToBed \ $(SRC_DIR)/bamToFastq \ @@ -107,6 +109,12 @@ all: print_banner $(OBJ_DIR) $(BIN_DIR) autoversion $(UTIL_SUBDIRS) $(SUBDIRS) .PHONY: all +install: all + mkdir -p $(DESTDIR)$(prefix)/bin + for file in bin/* ; do \ + cp -f $$file $(DESTDIR)$(prefix)/bin; \ + done + print_banner: @echo "Building BEDTools:" @echo "=========================================================" diff --git a/src/pairToPair/pairToPair.cpp b/src/pairToPair/pairToPair.cpp index ddece960a039b539838fda22b8b411528820eedf..da80b76866d81c66621149055a7ec5b0ad38a2b7 100644 --- a/src/pairToPair/pairToPair.cpp +++ b/src/pairToPair/pairToPair.cpp @@ -136,7 +136,7 @@ void PairToPair::FindOverlaps(const BEDPE &a) { bool PairToPair::FindHitsOnBothEnds(const BEDPE &a, const vector<MATE> &qualityHitsEnd1, const vector<MATE> &qualityHitsEnd2) { - map<unsigned int, vector<MATE>, less<int> > hitsMap; + map<unsigned int, vector<MATE>, less<unsigned int> > hitsMap; for (vector<MATE>::const_iterator h = qualityHitsEnd1.begin(); h != qualityHitsEnd1.end(); ++h) { hitsMap[h->lineNum].push_back(*h); @@ -174,7 +174,7 @@ bool PairToPair::FindHitsOnBothEnds(const BEDPE &a, const vector<MATE> &qualityH void PairToPair::FindHitsOnEitherEnd(const BEDPE &a, const vector<MATE> &qualityHitsEnd1, const vector<MATE> &qualityHitsEnd2) { - map<unsigned int, vector<MATE>, less<int> > hitsMap; + map<unsigned int, vector<MATE>, less<unsigned int> > hitsMap; for (vector<MATE>::const_iterator h = qualityHitsEnd1.begin(); h != qualityHitsEnd1.end(); ++h) { hitsMap[h->lineNum].push_back(*h);