[Pkg-ocaml-maint-commits] r1918 - trunk/packages/facile/trunk/debian/patches

[Steffen Joeris]

Author: white-guest
Date: 2005-11-04 15:58:58 +0000 (Fri, 04 Nov 2005)
New Revision: 1918

Modified:
   trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch
   trunk/packages/facile/trunk/debian/patches/20-Makefile.dpatch
Log:
more tests for the files (for more archs)


Modified: trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch
===================================================================
--- trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch	2005-11-04 15:24:41 UTC (rev 1917)
+++ trunk/packages/facile/trunk/debian/patches/10-srcMakefile.dpatch	2005-11-04 15:58:58 UTC (rev 1918)
@@ -1,5 +1,5 @@
 #!/bin/sh -e
-## 10-srcMakefile.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+## 10-debianlike.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Here we make facile available for more architectures :=)
@@ -23,8 +23,8 @@
 exit 0
 
 @DPATCH@
---- Makefile.orig	2005-11-03 18:08:27.000000000 +0100
-+++ facile-1.1/src/Makefile	2005-11-03 18:21:08.000000000 +0100
+--- Makefile.orig	2005-11-04 16:52:50.000000000 +0100
++++ facile-1.1/src/Makefile	2005-11-04 16:54:54.000000000 +0100
 @@ -23,7 +23,7 @@
  	$(OCAMLC) -o $@ -a $(CSTRCMO)
  
@@ -34,3 +34,21 @@
  
  # Version of the library to be linked with the -p (profiler) option
  facile.p.cmxa : $(CSTR)
+@@ -31,7 +31,7 @@
+ 	make facile.cmxa OPTOPT=-p
+ 	rm -fr $(CSTRCMX)
+ 	mv facile.cmxa $@
+-	mv facile.a facile.p.a
++	if [ -e facile.a ] ;  then mv facile.a facile.p.a ; fi
+ 
+ # Toplevel (to be run with the "-I +facile" option)
+ facile : facile.cma
+@@ -45,7 +45,7 @@
+ 	make facile.cmxa OPTOPT="-pp inline_functors"
+ 	rm -fr $(CSTRCMX)
+ 	mv facile.cmxa $@
+-	mv facile.a facile.exp.a
++	if [ -e facile.a ] ; then mv facile.a facile.exp.a ; fi
+ 
+ .SUFFIXES:
+ .SUFFIXES: .ml .mli .mly .mll .cmi .cmo .cmx .p.cmx .s

Modified: trunk/packages/facile/trunk/debian/patches/20-Makefile.dpatch
===================================================================
--- trunk/packages/facile/trunk/debian/patches/20-Makefile.dpatch	2005-11-04 15:24:41 UTC (rev 1917)
+++ trunk/packages/facile/trunk/debian/patches/20-Makefile.dpatch	2005-11-04 15:58:58 UTC (rev 1918)
@@ -24,18 +24,24 @@
 
 @DPATCH@
 --- Makefile.orig	2005-11-04 16:14:10.000000000 +0100
-+++ facile-1.1/Makefile	2005-11-04 16:16:50.000000000 +0100
-@@ -7,10 +7,11 @@
++++ facile-1.1/Makefile	2005-11-04 16:47:09.000000000 +0100
+@@ -7,11 +7,14 @@
  
  install:
  	if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi
 -	cp src/facile.cmi src/facile.cma src/facile.cmxa src/facile.a $(FACILEDIR)
-+	cp src/facile.cmi src/facile.cma src/facile.a $(FACILEDIR)	
+-	chmod a+r $(FACILEDIR)/facile.cmi
+-	chmod a+r $(FACILEDIR)/facile.cma
+-	chmod a+r $(FACILEDIR)/facile.cmxa
+-	chmod a+r $(FACILEDIR)/facile.a
++	if [ -e src/facile.cmi ] ; then cp src/facile.cmi $(FACILEDIR) ; fi
++	if [ -e src/facile.cma ] ; then cp src/facile.cma $(FACILEDIR) ; fi
++	if [ -e src/facile.a ] ; then cp src/facile.a $(FACILEDIR) ; fi
 +	if [ -e src/facile.cmxa ] ; then cp src/facile.cmxa $(FACILEDIR) ; fi
- 	chmod a+r $(FACILEDIR)/facile.cmi
- 	chmod a+r $(FACILEDIR)/facile.cma
--	chmod a+r $(FACILEDIR)/facile.cmxa
++	if [ -e $(FACILEDIR)/facile.cmi ] ; then chmod a+r $(FACILEDIR)/facile.cmi ; fi
++	if [ -e $(FACILEDIR)/facile.cma ] ; then chmod a+r $(FACILEDIR)/facile.cma ; fi
 +	if [ -e $(FACILEDIR)/facile.cmxa ] ; then chmod a+r $(FACILEDIR)/facile.cmxa ; fi
- 	chmod a+r $(FACILEDIR)/facile.a
++	if [ -e $(FACILEDIR)/facile.a ] ; then chmod a+r $(FACILEDIR)/facile.a ; fi
  
  clean:
+ 	cd src; make clean