The following commit has been merged in the master branch:
commit c8bdd9e0fc12634749a2d0c7c5f678c49f7747dc
Author: Stephane Glondu <[EMAIL PROTECTED]>
Date: Tue Jul 8 13:56:53 2008 +0200
Copy config.{sub,guess} in pre-config phase instead of clean
diff --git a/debian/rules b/debian/rules
index 98c334b..07e0a76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,14 @@ debian/control:
sed -e 's/#OcamlNativeArchs#/$(NATIVE_ARCHS)/g' debian/control.in > $@
pre-config: debian/$(SRCTARBALL)
+ for ext in sub guess; do \
+ if [ -f /usr/share/misc/config.$$ext ] && ! [ -f
debian/config.orig.$$ext ] ; then \
+ mv config/gnu/config.$$ext debian/config.orig.$$ext; \
+ cp -f /usr/share/misc/config.$$ext config/gnu/config.$$ext; \
+ fi; \
+ done
touch $@
+
debian/$(SRCTARBALL):
ln -fs . $(DISTDIR) # beware of the symlink recursion!
tar --anchored -chjf $@ \
@@ -134,12 +141,11 @@ clean: abi-sed unpatch
$(MAKE) -C debian/ocaml-md5sums clean
$(MAKE) -C debian/dh-ocaml clean
$(MAKE) -C debian/policy clean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- -cp -f /usr/share/misc/config.sub config/gnu/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- -cp -f /usr/share/misc/config.guess config/gnu/config.guess
-endif
+ for ext in sub guess; do \
+ if [ -f debian/config.orig.$$ext ] ; then \
+ mv -f debian/config.orig.$$ext config/gnu/config.$$ext; \
+ fi; \
+ done
# File not cleaned by upstream
-$(RM) _boot_log1
-$(RM) _boot_log2
--
OCaml packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
