mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
Merge branch 'v5.0'
This commit is contained in:
commit
8e355f7fdb
2 changed files with 7 additions and 1 deletions
|
@ -27,6 +27,11 @@ dist_doc_DATA = \
|
||||||
doc/xz-file-format.txt \
|
doc/xz-file-format.txt \
|
||||||
doc/lzma-file-format.txt
|
doc/lzma-file-format.txt
|
||||||
|
|
||||||
|
examplesdir = $(docdir)/examples
|
||||||
|
dist_examples_DATA = \
|
||||||
|
doc/examples/xz_pipe_comp.c \
|
||||||
|
doc/examples/xz_pipe_decomp.c
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
extra \
|
extra \
|
||||||
dos \
|
dos \
|
||||||
|
|
|
@ -161,7 +161,7 @@ fi
|
||||||
|
|
||||||
# Copy the headers, the .def file, and the docs.
|
# Copy the headers, the .def file, and the docs.
|
||||||
# They are the same for all architectures and builds.
|
# They are the same for all architectures and builds.
|
||||||
mkdir -pv pkg/{include/lzma,doc/manuals}
|
mkdir -pv pkg/{include/lzma,doc/{manuals,examples}}
|
||||||
txtcp pkg/include "" src/liblzma/api/lzma.h
|
txtcp pkg/include "" src/liblzma/api/lzma.h
|
||||||
txtcp pkg/include/lzma "" src/liblzma/api/lzma/*.h
|
txtcp pkg/include/lzma "" src/liblzma/api/lzma/*.h
|
||||||
txtcp pkg/doc "" src/liblzma/liblzma.def
|
txtcp pkg/doc "" src/liblzma/liblzma.def
|
||||||
|
@ -169,6 +169,7 @@ txtcp pkg/doc .txt AUTHORS COPYING NEWS README THANKS TODO
|
||||||
txtcp pkg/doc "" doc/*.txt windows/README-Windows.txt
|
txtcp pkg/doc "" doc/*.txt windows/README-Windows.txt
|
||||||
txtcp pkg/doc/manuals "" doc/man/txt/{xz,xzdec,lzmainfo}.txt
|
txtcp pkg/doc/manuals "" doc/man/txt/{xz,xzdec,lzmainfo}.txt
|
||||||
cp -v doc/man/pdf-*/{xz,xzdec,lzmainfo}-*.pdf pkg/doc/manuals
|
cp -v doc/man/pdf-*/{xz,xzdec,lzmainfo}-*.pdf pkg/doc/manuals
|
||||||
|
txtcp pkg/doc/examples "" doc/examples/*
|
||||||
|
|
||||||
if [ -f windows/COPYING-Windows.txt ]; then
|
if [ -f windows/COPYING-Windows.txt ]; then
|
||||||
txtcp pkg/doc "" windows/COPYING-Windows.txt
|
txtcp pkg/doc "" windows/COPYING-Windows.txt
|
||||||
|
|
Loading…
Reference in a new issue