M configure

M    Makefile.in
M    configure.ac
A    libopenjpeg.pc.in
M    doc/Makefile.in
M    doc/Makefile.am
M    CHANGES
M    Makefile.am

2 files changed, 46 insertions, 29 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5cf2ecd3..809c8011 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,26 +16,34 @@ 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/* .
+	@cp man/man1/* .
+	@cp man/man3/* .
 
 install-data-hook:
 	$(INSTALL) -d $(doc_dir)
 	$(INSTALL) -d ${mandir}/man1 ${mandir}/man3
 if with_libjpwl
-	(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
-	(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
+	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
+	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
 endif
-	(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
-	(cd ${mandir}/man3 && $(RM) 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 ${mandir}/man1
-	cp libopenjpeg.3.gz ${mandir}/man3
-	$(RM) *\.gz
+	@(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+	@(cd ${mandir}/man3 && $(RM) 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 ${mandir}/man1
+	@cp libopenjpeg.3.gz ${mandir}/man3
+	@$(RM) *\.gz
 if with_libjpwl
-	(cd ${mandir}/man1 && \
+	@(cd ${mandir}/man1 && \
 	$(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
 	$(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)
-	(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
+	@(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
 endif
-	cp ../LICENSE ../CHANGES $(doc_dir)
+	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
+
+uninstall-hook:
+	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
+	$(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
+	$(RM) libopenjpeg* )
+	@(cd $(doc_dir) && $(RM) * )
+	@rmdir $(doc_dir)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8218cc3d..075d499e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -364,8 +364,9 @@ ps: ps-am
 ps-am:
 
 uninstall-am:
-
-.MAKE: install-am install-data-am install-strip
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
 	clean-libtool distclean distclean-generic distclean-libtool \
@@ -377,7 +378,7 @@ uninstall-am:
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am
+	ps ps-am uninstall uninstall-am uninstall-hook
 
 
 @with_doxygen_TRUE@docs:
@@ -390,25 +391,33 @@ 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/* .
+	@cp man/man1/* .
+	@cp man/man3/* .
 
 install-data-hook:
 	$(INSTALL) -d $(doc_dir)
 	$(INSTALL) -d ${mandir}/man1 ${mandir}/man3
-@with_libjpwl_TRUE@	(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
-@with_libjpwl_TRUE@	(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
-	(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
-	(cd ${mandir}/man3 && $(RM) 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 ${mandir}/man1
-	cp libopenjpeg.3.gz ${mandir}/man3
-	$(RM) *\.gz
-@with_libjpwl_TRUE@	(cd ${mandir}/man1 && \
+@with_libjpwl_TRUE@	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
+@with_libjpwl_TRUE@	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
+	@(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+	@(cd ${mandir}/man3 && $(RM) 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 ${mandir}/man1
+	@cp libopenjpeg.3.gz ${mandir}/man3
+	@$(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)
-@with_libjpwl_TRUE@	(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
-	cp ../LICENSE ../CHANGES $(doc_dir)
+@with_libjpwl_TRUE@	@(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
+	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
+
+uninstall-hook:
+	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
+	$(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
+	$(RM) libopenjpeg* )
+	@(cd $(doc_dir) && $(RM) * )
+	@rmdir $(doc_dir)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.