aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Erdmann <dywi@mailerd.de>2014-02-22 15:26:44 +0100
committerAndré Erdmann <dywi@mailerd.de>2014-02-22 15:35:32 +0100
commit580f55bc730343381d0d6f596867a6601f821d28 (patch)
treec75208aa3d6cf0fc35fc2b99b8af84ac02de5384 /Makefile
parentroverlay/depres, rule reader: properly count files (diff)
downloadR_overlay-580f55bc730343381d0d6f596867a6601f821d28.tar.gz
R_overlay-580f55bc730343381d0d6f596867a6601f821d28.tar.bz2
R_overlay-580f55bc730343381d0d6f596867a6601f821d28.zip
roverlay/util/fileio: support xz compression
* roverlay/util/fileio: ** read/write_text_file(): add support for xz ** read_text_file(): catch compression-related errors for the first text line only ** read_text_file(): make sure to close the file(!) ** TextFile: add get_default_compression() * move SUPPORTED_COMPRESSION dict to roverlay/util/compression * roverlay/config/entrymap: use roverlay/util/compression * roverlay/db/distmap: get_default_compression()
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 4f2c60e..495f6c8 100644
--- a/Makefile
+++ b/Makefile
@@ -28,9 +28,10 @@ ROVERLAY_MAIN := ./roverlay.py
PYVER :=
PYTHON := python$(PYVER)
-PYDOC_SH = ./bin/build/do_pydoc.sh
+PYDOC_SH := ./bin/build/do_pydoc.sh
+X_COMPRESS := bzip2
-RST_HTML = ./bin/build/roverlay_rst2html.sh
+RST_HTML := ./bin/build/roverlay_rst2html.sh
SRC_DOCDIR := ./doc
@@ -130,8 +131,8 @@ dist: distclean release
compress-config: $(BUILDDIR)
@install -d $(BUILDDIR)/config
cp -vLr -p --no-preserve=ownership config/simple-deprules.d $(BUILDDIR)/config/
- find $(BUILDDIR)/config/simple-deprules.d/ -type f -print0 | xargs -0 -n 5 --verbose bzip2
- bzip2 -k -c config/license.map > $(BUILDDIR)/config/license.map
+ find $(BUILDDIR)/config/simple-deprules.d/ -type f -print0 | xargs -0 -n 5 --verbose $(X_COMPRESS)
+ $(X_COMPRESS) -c config/license.map > $(BUILDDIR)/config/license.map
install-roverlay: ./roverlay.py
install -T -D -- ./roverlay.py $(BINDIR)/roverlay