Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocaml-dune


Commits:
7985491d by Stephane Glondu at 2023-08-07T05:59:10+02:00
Simplify debian/rules

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+ocaml-dune (3.9.1-2) UNRELEASED; urgency=medium
+
+  * Simplify debian/rules
+
+ -- Stéphane Glondu <[email protected]>  Mon, 07 Aug 2023 05:59:04 +0200
+
 ocaml-dune (3.9.1-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/rules
=====================================
@@ -7,17 +7,11 @@
 
 include /usr/share/ocaml/ocamlvars.mk
 
-export DESTDIR=$(CURDIR)/debian/tmp
-export PREFIX=/usr
-export LIBDIR=..$(OCAML_STDLIB_DIR)
+DESTDIR=$(CURDIR)/debian/tmp
 
 %:
        dh $@ --with ocaml
 
-override_dh_auto_clean:
-       dh_auto_clean
-       rm -rf _tmp
-
 override_dh_auto_configure:
        ./configure --libdir $(OCAML_STDLIB_DIR)
 
@@ -27,9 +21,7 @@ override_dh_auto_build:
        ./dune.exe build stdune.install dune-private-libs.install 
dune-configurator.install xdg.install
 
 override_dh_auto_install:
-       ./dune.exe install --destdir=$(CURDIR)/_tmp --prefix=/usr 
--libdir=$(OCAML_STDLIB_DIR) dune dune-private-libs dune-configurator stdune xdg
-       rm -rf debian/tmp
-       cp -a _tmp debian/tmp
+       ./dune.exe install --destdir=$(DESTDIR) --prefix=/usr 
--libdir=$(OCAML_STDLIB_DIR) dune dune-private-libs dune-configurator stdune xdg
        rm -rf debian/tmp/usr/doc/dune-private-libs 
debian/tmp/usr/doc/dune-configurator debian/tmp/usr/doc/stdune 
debian/tmp/usr/doc/xdg debian/tmp/usr/doc/dune/LICENSE.md
 
 override_dh_auto_test:



View it on GitLab: 
https://salsa.debian.org/ocaml-team/ocaml-dune/-/commit/7985491d3139ecbdc48a23c80d3e62f94cdc31ab

-- 
View it on GitLab: 
https://salsa.debian.org/ocaml-team/ocaml-dune/-/commit/7985491d3139ecbdc48a23c80d3e62f94cdc31ab
You're receiving this email because of your account on salsa.debian.org.


Reply via email to