summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorWinfried <szukw000@arcor.de>2010-10-18 00:17:19 +0000
committerWinfried <szukw000@arcor.de>2010-10-18 00:17:19 +0000
commite65ef3a24f92101a5ac55bf143f7d6c4829a88d6 (patch)
tree1834cadb8293f069715d39118d085270fec64983 /doc
parentf4b08bacb03457eae440ed88f70ac1598f2cee42 (diff)
M jp3d/Makefile.nix
M config.nix M doc/Makefile.in M doc/Makefile.am M doc/Makefile.nix M CHANGES M jpwl/Makefile.nix M Makefile.nix
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am4
-rw-r--r--doc/Makefile.in4
-rw-r--r--doc/Makefile.nix8
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cdd2dd73..5cf2ecd3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,6 +16,8 @@ all-local:
@echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt
@echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt
@echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt
+ cp man/man1/* .
+ cp man/man3/* .
install-data-hook:
$(INSTALL) -d $(doc_dir)
@@ -29,7 +31,7 @@ endif
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
cp libopenjpeg.3.gz ${mandir}/man3
- gunzip *\.gz
+ $(RM) *\.gz
if with_libjpwl
(cd ${mandir}/man1 && \
$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 6f0e168f..8218cc3d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -390,6 +390,8 @@ all-local:
@echo "Installing: j2k_dump.1 ${mandir}/man1" >> .report.txt
@echo "Installing: libopenjpeg.3 ${mandir}/man3" >> .report.txt
@echo "Installing: LICENSE CHANGES $(doc_dir)" >> .report.txt
+ cp man/man1/* .
+ cp man/man3/* .
install-data-hook:
$(INSTALL) -d $(doc_dir)
@@ -401,7 +403,7 @@ install-data-hook:
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
cp libopenjpeg.3.gz ${mandir}/man3
- gunzip *\.gz
+ $(RM) *\.gz
@with_libjpwl_TRUE@ (cd ${mandir}/man1 && \
@with_libjpwl_TRUE@ $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
@with_libjpwl_TRUE@ $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)
diff --git a/doc/Makefile.nix b/doc/Makefile.nix
index fae568dd..302d31b0 100644
--- a/doc/Makefile.nix
+++ b/doc/Makefile.nix
@@ -14,6 +14,8 @@ clean:
rm -rf html
install:
+ cp man/man1/* .
+ cp man/man3/* .
install -d $(doc_dir)
install -d $(man_dir)/man1 $(man_dir)/man3
ifeq ($(WITH_JPWL),yes)
@@ -23,9 +25,9 @@ endif
(cd $(man_dir)/man1 && rm -f image_to_j2k* j2k_to_image* j2k_dump* )
(cd $(man_dir)/man3 && rm -f libopenjpeg* )
gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
- cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(man_dir)/man1
- cp libopenjpeg.3.gz $(man_dir)/man3
- gunzip *\.gz
+ cp -f image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(man_dir)/man1
+ cp -f libopenjpeg.3.gz $(man_dir)/man3
+ rm -f *\.gz
ifeq ($(WITH_JPWL),yes)
(cd $(man_dir)/man1 && \
ln -sf image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \