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
2 changed files:
Changes:
| 1 | +ocaml-dune (3.9.1-2) UNRELEASED; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Simplify debian/rules
|
|
| 4 | + |
|
| 5 | + -- Stéphane Glondu <glondu@debian.org> Mon, 07 Aug 2023 05:59:04 +0200
|
|
| 6 | + |
|
| 1 | 7 | ocaml-dune (3.9.1-1) unstable; urgency=medium
|
| 2 | 8 | |
| 3 | 9 | * New upstream release
|
| ... | ... | @@ -7,17 +7,11 @@ |
| 7 | 7 | |
| 8 | 8 | include /usr/share/ocaml/ocamlvars.mk
|
| 9 | 9 | |
| 10 | -export DESTDIR=$(CURDIR)/debian/tmp
|
|
| 11 | -export PREFIX=/usr
|
|
| 12 | -export LIBDIR=..$(OCAML_STDLIB_DIR)
|
|
| 10 | +DESTDIR=$(CURDIR)/debian/tmp
|
|
| 13 | 11 | |
| 14 | 12 | %:
|
| 15 | 13 | dh $@ --with ocaml
|
| 16 | 14 | |
| 17 | -override_dh_auto_clean:
|
|
| 18 | - dh_auto_clean
|
|
| 19 | - rm -rf _tmp
|
|
| 20 | - |
|
| 21 | 15 | override_dh_auto_configure:
|
| 22 | 16 | ./configure --libdir $(OCAML_STDLIB_DIR)
|
| 23 | 17 | |
| ... | ... | @@ -27,9 +21,7 @@ override_dh_auto_build: |
| 27 | 21 | ./dune.exe build stdune.install dune-private-libs.install dune-configurator.install xdg.install
|
| 28 | 22 | |
| 29 | 23 | override_dh_auto_install:
|
| 30 | - ./dune.exe install --destdir=$(CURDIR)/_tmp --prefix=/usr --libdir=$(OCAML_STDLIB_DIR) dune dune-private-libs dune-configurator stdune xdg
|
|
| 31 | - rm -rf debian/tmp
|
|
| 32 | - cp -a _tmp debian/tmp
|
|
| 24 | + ./dune.exe install --destdir=$(DESTDIR) --prefix=/usr --libdir=$(OCAML_STDLIB_DIR) dune dune-private-libs dune-configurator stdune xdg
|
|
| 33 | 25 | 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
|
| 34 | 26 | |
| 35 | 27 | override_dh_auto_test:
|