[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-2-8-ge1bb0fd

Stephane Glondu steph at glondu.net
Wed Apr 11 12:46:08 UTC 2012


The following commit has been merged in the master branch:
commit 2af28d9285c3fc4fe80088a7e26e17f8333a215f
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Feb 8 17:45:15 2012 +0100

    Remove empty directory at the right time

diff --git a/debian/rules b/debian/rules
index 6db6b7b..640a5d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -194,6 +194,8 @@ endif
 # Install OCaml
 	sed -e 's|PREFIX=\"/.*\"|PREFIX=\"$(INSTDIR)"|' < config/config.sh > config/config.debian.install.sh
 	$(MAKE) install PREFIX=$(INSTDIR)
+# Remove empty directory
+	rmdir $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/ocamldoc/custom
 # To avoid erroneous dh_install warnings
 	rm -f $(INSTDIR)/share/man/man1/ocamlopt.opt.1 $(INSTDIR)/share/man/man1/ocamlc.opt.1
 # Dispatch files with dh_install
@@ -223,8 +225,6 @@ endif
 	  ln -sf ../ocaml-base-nox/README.gz . && \
 	  ln -sf ../ocaml-base-nox/README.Debian .; \
 	); done
-# Remove empty directory
-	rmdir $(CURDIR)/debian/ocaml-nox$(OCAML_STDLIB_DIR)/ocamldoc/custom
 # Remaining stuff
 	touch $@
 

-- 
OCaml packaging



More information about the Pkg-ocaml-maint-commits mailing list