18897274 /usr/share/man/man1/7zr.1 should be delivered by unix text format
authorDanek Duvall <danek.duvall@oracle.com>
Tue, 03 Jun 2014 14:13:02 -0700
changeset 1930 062897f667fa
parent 1929 6b2e121197e3
child 1931 6085605fd300
18897274 /usr/share/man/man1/7zr.1 should be delivered by unix text format
components/p7zip/Makefile
--- a/components/p7zip/Makefile	Tue Jun 03 14:58:32 2014 -0600
+++ b/components/p7zip/Makefile	Tue Jun 03 14:13:02 2014 -0700
@@ -69,7 +69,9 @@
 
 # When p7zip's install target is run, it creates all its directories mode 555,
 # so they're impossible to remove without adding the write bit first.
-COMPONENT_POST_INSTALL_ACTION += $(CHMOD) -R u+w $(PROTO_DIR)
+COMPONENT_POST_INSTALL_ACTION += $(CHMOD) -R u+w $(PROTO_DIR);
+# 7zr.1 is in DOS format for some reason, and geqn can't handle it.
+COMPONENT_POST_INSTALL_ACTION += $(GSED) -i -e 's/\r//' $(PROTO_DIR)/usr/man/man1/7zr.1
 
 # build does this always
 test:	$(BUILD_32)