summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Glondu <steph@glondu.net>2023-07-22 09:37:58 +0200
committerStephane Glondu <steph@glondu.net>2023-07-22 09:37:58 +0200
commitd54e72f3ea9e51585511c114673aab4d46507d46 (patch)
treeb76d48977e8896552deb8f3828283b51e8a45f87
parent179e165f4ed688098ce71a79b17b5e23822bf657 (diff)
Refresh patches
-rw-r--r--debian/patches/install-x.patch38
1 files changed, 20 insertions, 18 deletions
diff --git a/debian/patches/install-x.patch b/debian/patches/install-x.patch
index cb1cb63..55629ea 100644
--- a/debian/patches/install-x.patch
+++ b/debian/patches/install-x.patch
@@ -6,38 +6,40 @@ Subject: install without adding execute permissions
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---- cmdliner.orig/Makefile
-+++ cmdliner/Makefile
-@@ -41,7 +41,7 @@
+diff --git a/Makefile b/Makefile
+index a3921d7..f1e5b1f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,7 @@ install: $(INSTALL-TARGETS)
install-doc:
- $(INSTALL) -d $(DOCDIR)/odoc-pages
-- $(INSTALL) CHANGES.md LICENSE.md README.md $(DOCDIR)
-+ $(INSTALL) -m 644 CHANGES.md LICENSE.md README.md $(DOCDIR)
+ $(INSTALL) -d "$(DOCDIR)/odoc-pages"
+- $(INSTALL) CHANGES.md LICENSE.md README.md "$(DOCDIR)"
++ $(INSTALL) -m 644 CHANGES.md LICENSE.md README.md "$(DOCDIR)"
$(INSTALL) doc/index.mld doc/cli.mld doc/examples.mld doc/tutorial.mld \
- doc/tool_man.mld $(DOCDIR)/odoc-pages
+ doc/tool_man.mld "$(DOCDIR)/odoc-pages"
-@@ -61,18 +61,18 @@
- $(INSTALL) -d $(LIBDIR)
+@@ -61,18 +61,18 @@ create-libdir:
+ $(INSTALL) -d "$(LIBDIR)"
install-common: create-libdir
-- $(INSTALL) pkg/META $(BASE).mli $(BASE).cmi $(BASE).cmti $(LIBDIR)
-- $(INSTALL) cmdliner.opam $(LIBDIR)/opam
-+ $(INSTALL) -m 644 pkg/META $(BASE).mli $(BASE).cmi $(BASE).cmti $(LIBDIR)
-+ $(INSTALL) -m 644 cmdliner.opam $(LIBDIR)/opam
+- $(INSTALL) pkg/META $(BASE).mli $(BASE).cmi $(BASE).cmti "$(LIBDIR)"
+- $(INSTALL) cmdliner.opam "$(LIBDIR)/opam"
++ $(INSTALL) -m 644 pkg/META $(BASE).mli $(BASE).cmi $(BASE).cmti "$(LIBDIR)"
++ $(INSTALL) -m 644 cmdliner.opam "$(LIBDIR)/opam"
install-byte: create-libdir
-- $(INSTALL) $(BASE).cma $(LIBDIR)
-+ $(INSTALL) -m 644 $(BASE).cma $(LIBDIR)
+- $(INSTALL) $(BASE).cma "$(LIBDIR)"
++ $(INSTALL) -m 644 $(BASE).cma "$(LIBDIR)"
install-native: create-libdir
- $(INSTALL) $(BASE).cmxa $(BASE)$(EXT_LIB) $(wildcard $(B)/cmdliner*.cmx) \
+ $(INSTALL) -m 644 $(BASE).cmxa $(BASE)$(EXT_LIB) $(wildcard $(B)/cmdliner*.cmx) \
- $(LIBDIR)
+ "$(LIBDIR)"
install-native-dynlink: create-libdir
-- $(INSTALL) $(BASE).cmxs $(LIBDIR)
-+ $(INSTALL) -m 644 $(BASE).cmxs $(LIBDIR)
+- $(INSTALL) $(BASE).cmxs "$(LIBDIR)"
++ $(INSTALL) -m 644 $(BASE).cmxs "$(LIBDIR)"
.PHONY: all install install-doc clean build-byte build-native \
build-native-dynlink create-libdir install-common install-byte \