[med-svn] r4679 - trunk/packages/mummer/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2010-03-24 13:47:00 +0000 (Wed, 24 Mar 2010)
New Revision: 4679

Added:
   trunk/packages/mummer/trunk/debian/patches/10_install_dirs.patch
Modified:
   trunk/packages/mummer/trunk/debian/patches/series
Log:
I'm working on the "bin_dirs" issue offline and want to announce it this way. The patch does not finally fix the problem (just 7 cases out of 20)


Added: trunk/packages/mummer/trunk/debian/patches/10_install_dirs.patch
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/10_install_dirs.patch	                        (rev 0)
+++ trunk/packages/mummer/trunk/debian/patches/10_install_dirs.patch	2010-03-24 13:47:00 UTC (rev 4679)
@@ -0,0 +1,75 @@
+--- mummer-3.22~dfsg.orig/scripts/Makefile
++++ mummer-3.22~dfsg/scripts/Makefile
+@@ -4,14 +4,19 @@
+ ifndef BIN_DIR
+ BIN_DIR := $(CURDIR)
+ endif
++ifndef INSTALL_BIN_DIR
++FINAL_BIN_DIR := $(BIN_DIR)
++endif
+ ifndef AUX_BIN_DIR
+ AUX_BIN_DIR := $(CURDIR)
+ endif
++ifndef INSTALL_AUX_BIN_DIR
++FINAL_AUX_BIN_DIR := $(BIN_DIR)
++endif
+ ifndef SCRIPT_DIR
+ SCRIPT_DIR := $(CURDIR)
+ endif
+ 
+-SCRIPT_DIR := $(CURDIR)
+ SED := $(filter /%,$(shell /bin/sh -c 'type sed'))
+ CSH := $(filter /%,$(shell /bin/sh -c 'type csh'))
+ PERL := $(filter /%,$(shell /bin/sh -c 'type perl'))
+@@ -37,7 +42,7 @@
+ #-- not so PHONY rules --#
+ exact-tandems: exact-tandems.csh
+ 	$(SED)  -e 's?__CSH_PATH?$(CSH)?g' \
+-		-e 's?__BIN_DIR?$(BIN_DIR)?g' \
++		-e 's?__BIN_DIR?$(FINAL_BIN_DIR)?g' \
+ 		-e 's?__SCRIPT_DIR?$(SCRIPT_DIR)?g' \
+ 		exact-tandems.csh > $(BIN_DIR)/exact-tandems
+ 	chmod 755 $(BIN_DIR)/exact-tandems
+@@ -51,21 +56,21 @@
+ mummerplot: mummerplot.pl Foundation.pm
+ 	$(SED)  -e 's?__PERL_PATH?$(PERL)?g' \
+                 -e 's?__SCRIPT_DIR?$(SCRIPT_DIR)?g' \
+-                -e 's?__BIN_DIR?$(BIN_DIR)?g' \
++                -e 's?__BIN_DIR?$(FINAL_BIN_DIR)?g' \
+                 mummerplot.pl > $(BIN_DIR)/mummerplot
+ 	chmod 755 $(BIN_DIR)/mummerplot
+ 
+ dnadiff: dnadiff.pl Foundation.pm
+ 	$(SED) -e 's?__PERL_PATH?$(PERL)?g' \
+                -e 's?__SCRIPT_DIR?$(SCRIPT_DIR)?g' \
+-               -e 's?__BIN_DIR?$(BIN_DIR)?g' \
++               -e 's?__BIN_DIR?$(FINAL_BIN_DIR)?g' \
+                  dnadiff.pl > $(BIN_DIR)/dnadiff
+ 	chmod 755 $(BIN_DIR)/dnadiff
+ 
+ nucmer: nucmer.pl Foundation.pm
+ 	$(SED)  -e 's?__PERL_PATH?$(PERL)?g' \
+                 -e 's?__SCRIPT_DIR?$(SCRIPT_DIR)?g' \
+-                -e 's?__AUX_BIN_DIR?$(AUX_BIN_DIR)?g' \
++                -e 's?__AUX_BIN_DIR?$(FINAL_AUX_BIN_DIR)?g' \
+                 -e 's?__BIN_DIR?$(BIN_DIR)?g' \
+                  nucmer.pl > $(BIN_DIR)/nucmer
+ 	chmod 755 $(BIN_DIR)/nucmer
+@@ -73,14 +78,14 @@
+ promer: promer.pl Foundation.pm
+ 	$(SED)  -e 's?__PERL_PATH?$(PERL)?g' \
+                 -e 's?__SCRIPT_DIR?$(SCRIPT_DIR)?g' \
+-                -e 's?__AUX_BIN_DIR?$(AUX_BIN_DIR)?g' \
+-                -e 's?__BIN_DIR?$(BIN_DIR)?g' \
++                -e 's?__AUX_BIN_DIR?$(FINAL_AUX_BIN_DIR)?g' \
++                -e 's?__BIN_DIR?$(FINAL_BIN_DIR)?g' \
+                 promer.pl > $(BIN_DIR)/promer
+ 	chmod 755 $(BIN_DIR)/promer
+ 
+ run-mummer1: run-mummer1.csh
+ 	$(SED)  -e 's?__CSH_PATH?$(CSH)?g' \
+-		-e 's?__BIN_DIR?$(BIN_DIR)?g' \
++		-e 's?__BIN_DIR?$(FINAL_BIN_DIR)?g' \
+ 		run-mummer1.csh > $(BIN_DIR)/run-mummer1
+ 	chmod 755 $(BIN_DIR)/run-mummer1
+ 

Modified: trunk/packages/mummer/trunk/debian/patches/series
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/series	2010-03-24 04:25:34 UTC (rev 4678)
+++ trunk/packages/mummer/trunk/debian/patches/series	2010-03-24 13:47:00 UTC (rev 4679)
@@ -1 +1,2 @@
+10_install_dirs.patch
 02at_docs_web.diff