diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2010-10-26 15:53:06 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2010-10-26 15:53:06 +0300 |
| commit | 8e355f7fdbeee6fe394eb02a28f267ce99a882a2 (patch) | |
| tree | 5d43aafecd8c1d4e8a0753b1d9e813a7dc5f0cfc | |
| parent | liblzma: Rename a few variables and constants. (diff) | |
| parent | Build: Copy the example programs to $docdir/examples. (diff) | |
| download | xz-8e355f7fdbeee6fe394eb02a28f267ce99a882a2.tar.xz | |
Merge branch 'v5.0'
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | windows/build.bash | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 91c7c085..2ce74aa5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,11 @@ dist_doc_DATA = \ doc/xz-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 \ dos \ diff --git a/windows/build.bash b/windows/build.bash index 40808bc9..faec83b3 100644 --- a/windows/build.bash +++ b/windows/build.bash @@ -161,7 +161,7 @@ fi # Copy the headers, the .def file, and the docs. # 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/lzma "" src/liblzma/api/lzma/*.h 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/manuals "" doc/man/txt/{xz,xzdec,lzmainfo}.txt 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 txtcp pkg/doc "" windows/COPYING-Windows.txt |