From 51f7cc6874d9d61e1f6c23936a6b5a6f080d78d3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 13 Jan 2011 20:18:53 +0000
Subject: [PATCH] followup autotools fixes, adding DESTDIR support

---
 Makefile.am     | 10 +++++-----
 doc/Makefile.am | 28 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 26e1df0d..8a9bfa40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,12 +17,12 @@ install-data-hook:
 	cat $${dir}/.report.txt ; \
 	done
 	@echo ""
-	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
+	@echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)"
 	@echo ""
-	@$(INSTALL) -d $(pkgconf_dir)
-	@cp libopenjpeg1.pc $(pkgconf_dir)/libopenjpeg1.pc
-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
+	@$(INSTALL) -d $(DESTDIR)$(pkgconf_dir)
+	@cp libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc
+	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \
 	$(LN_S) libopenjpeg1.pc libopenjpeg.pc)
 
 uninstall-hook:
-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
+	@(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 809c8011..d2bdde06 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,30 +20,30 @@ all-local:
 	@cp man/man3/* .
 
 install-data-hook:
-	$(INSTALL) -d $(doc_dir)
-	$(INSTALL) -d ${mandir}/man1 ${mandir}/man3
+	$(INSTALL) -d $(DESTDIR)$(doc_dir)
+	$(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3
 if with_libjpwl
-	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
-	@(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
+	@(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
+	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
 endif
-	@(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
-	@(cd ${mandir}/man3 && $(RM) libopenjpeg* )
+	@(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+	@(cd $(DESTDIR)${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
+	@cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1
+	@cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3
 	@$(RM) *\.gz
 if with_libjpwl
-	@(cd ${mandir}/man1 && \
+	@(cd $(DESTDIR)${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)
 endif
-	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
+	@$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir)
 
 uninstall-hook:
-	@(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
+	@(cd $(DESTDIR)${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* && \
+	@(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
 	$(RM) libopenjpeg* )
-	@(cd $(doc_dir) && $(RM) * )
-	@rmdir $(doc_dir)
+	@(cd $(DESTDIR)$(doc_dir) && $(RM) * )
+	@rmdir $(DESTDIR)$(doc_dir)