From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 17 Aug 2020 17:23:37 +0000 (+0000)
Subject: 7zip: Move files to /usr
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;ds=sidebyside;h=c2607bc4927520d90fab2e9bacadf961f5575339;p=people%2Fpmueller%2Fipfire-2.x.git

7zip: Move files to /usr

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip
index bcf0322d69..f56e95c8c4 100644
--- a/config/rootfiles/packages/7zip
+++ b/config/rootfiles/packages/7zip
@@ -1,106 +1,110 @@
 usr/bin/7z
+usr/bin/7za
+usr/bin/7zr
 usr/lib/p7zip
-#usr/lib/p7zip/7z
-#usr/lib/p7zip/7z.so
-#usr/lib/p7zip/Codecs
+usr/lib/p7zip/7z
+usr/lib/p7zip/7z.so
+usr/lib/p7zip/7zCon.sfx
+usr/lib/p7zip/7za
+usr/lib/p7zip/7zr
+usr/lib/p7zip/Codecs
 usr/lib/p7zip/Codecs/Rar.so
-#usr/man/man1/7z.1
-#usr/man/man1/7za.1
-#usr/man/man1/7zr.1
-#usr/share/doc/p7zip
-#usr/share/doc/p7zip/ChangeLog
-#usr/share/doc/p7zip/DOC
-#usr/share/doc/p7zip/DOC/7zC.txt
-#usr/share/doc/p7zip/DOC/7zFormat.txt
-#usr/share/doc/p7zip/DOC/License.txt
-#usr/share/doc/p7zip/DOC/MANUAL
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm
-#usr/share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/about.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/menu.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/options.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/fm/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/general
-#usr/share/doc/p7zip/DOC/MANUAL/general/7z.htm
-#usr/share/doc/p7zip/DOC/MANUAL/general/faq.htm
-#usr/share/doc/p7zip/DOC/MANUAL/general/formats.htm
-#usr/share/doc/p7zip/DOC/MANUAL/general/index.htm
-#usr/share/doc/p7zip/DOC/MANUAL/general/license.htm
-#usr/share/doc/p7zip/DOC/MANUAL/general/performance.htm
-#usr/share/doc/p7zip/DOC/MANUAL/general/style.css
-#usr/share/doc/p7zip/DOC/MANUAL/general/thanks.htm
-#usr/share/doc/p7zip/DOC/MANUAL/start.htm
-#usr/share/doc/p7zip/DOC/MANUAL/style.css
-#usr/share/doc/p7zip/DOC/Methods.txt
-#usr/share/doc/p7zip/DOC/copying.txt
-#usr/share/doc/p7zip/DOC/lzma.txt
-#usr/share/doc/p7zip/DOC/readme.txt
-#usr/share/doc/p7zip/DOC/src-history.txt
-#usr/share/doc/p7zip/DOC/unRarLicense.txt
-#usr/share/doc/p7zip/README
+#usr/share/doc/p7zip-16.02
+#usr/share/doc/p7zip-16.02/ChangeLog
+#usr/share/doc/p7zip-16.02/DOC
+#usr/share/doc/p7zip-16.02/DOC/7zC.txt
+#usr/share/doc/p7zip-16.02/DOC/7zFormat.txt
+#usr/share/doc/p7zip-16.02/DOC/License.txt
+#usr/share/doc/p7zip-16.02/DOC/MANUAL
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/add.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/bench.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/delete.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/extract.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/extract_full.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/hash.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/list.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/rename.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/test.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/commands/update.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/exit_codes.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_exclude.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_include.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ar_no.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/bb.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/bs.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/charset.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/exclude.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/include.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/large_pages.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/list_tech.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/method.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/output_dir.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/overwrite.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/password.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/recurse.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sa.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/scc.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/scrc.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sdel.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sfx.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/shared.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sni.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/sns.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/spf.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/ssc.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stdin.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stdout.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stl.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stop_switch.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/stx.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/type.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/update.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/volume.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/working_dir.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/switches/yes.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/cmdline/syntax.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/about.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/benchmark.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/menu.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/options.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/add.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/extract.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/7-zip/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/plugins/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/fm/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/7z.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/faq.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/formats.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/index.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/license.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/performance.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/style.css
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/general/thanks.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/start.htm
+#usr/share/doc/p7zip-16.02/DOC/MANUAL/style.css
+#usr/share/doc/p7zip-16.02/DOC/Methods.txt
+#usr/share/doc/p7zip-16.02/DOC/copying.txt
+#usr/share/doc/p7zip-16.02/DOC/lzma.txt
+#usr/share/doc/p7zip-16.02/DOC/readme.txt
+#usr/share/doc/p7zip-16.02/DOC/src-history.txt
+#usr/share/doc/p7zip-16.02/DOC/unRarLicense.txt
+#usr/share/doc/p7zip-16.02/README
+#usr/share/man/man1/7z.1
+#usr/share/man/man1/7za.1
+#usr/share/man/man1/7zr.1
diff --git a/lfs/7zip b/lfs/7zip
index 443119b6e5..7f8ca29f4d 100644
--- a/lfs/7zip
+++ b/lfs/7zip
@@ -80,7 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/p7zip-16.02-consolidated_fixes-1.patch
-	cd $(DIR_APP) && make 7z $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make all3 $(MAKETUNING)
+	cd $(DIR_APP) && make DEST_HOME=/usr DEST_MAN=/usr/share/man \
+		DEST_SHARE_DOC=/usr/share/doc/p7zip-$(VER) install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)