/hg/icedtea-web: Fix --mandir switch

[omajid at icedtea.classpath.org]

changeset 87d12ebb7047 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=87d12ebb7047
author: Omair Majid <omajid at redhat.com>
date: Tue Feb 22 12:59:18 2011 -0500

	Fix --mandir switch

	2011-02-22 Omair Majid <omajid at redhat.com> DJ Lucas
	<dj at lucasit.com>

	 * Makefile.am (install-data-local): Use $(mandir) for man
	page dir. (uninstall-local): Use $(mandir) for man page dir.
	    * AUTHORS: Update.


diffstat:

3 files changed, 12 insertions(+), 3 deletions(-)
AUTHORS     |    1 +
ChangeLog   |    8 ++++++++
Makefile.am |    6 +++---

diffs (49 lines):

diff -r cb3f89164966 -r 87d12ebb7047 AUTHORS
--- a/AUTHORS	Tue Feb 22 11:47:44 2011 -0500
+++ b/AUTHORS	Tue Feb 22 12:59:18 2011 -0500
@@ -7,6 +7,7 @@ Andrew John Hughes <gnu_andrew at member.fs
 Andrew John Hughes <gnu_andrew at member.fsf.org, ahughes at redhat.com>
 Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
+DJ Lucas <dj at lucasit.com>
 Omair Majid <omajid at redhat.com>
 Jon A. Maxwell <jmaxwell at users.sourceforge.net>
 Andrew Su <asu at redhat.com>
diff -r cb3f89164966 -r 87d12ebb7047 ChangeLog
--- a/ChangeLog	Tue Feb 22 11:47:44 2011 -0500
+++ b/ChangeLog	Tue Feb 22 12:59:18 2011 -0500
@@ -1,3 +1,11 @@ 2011-02-22  Omair Majid  <omajid at redhat.
+2011-02-22  Omair Majid  <omajid at redhat.com>
+            DJ Lucas  <dj at lucasit.com>
+
+	* Makefile.am
+	(install-data-local): Use $(mandir) for man page dir.
+	(uninstall-local): Use $(mandir) for man page dir.
+	* AUTHORS: Update.
+
 2011-02-22  Omair Majid  <omajid at redhat.com>
 
 	Install icedtea-web into a FHS-compliant location
diff -r cb3f89164966 -r 87d12ebb7047 Makefile.am
--- a/Makefile.am	Tue Feb 22 11:47:44 2011 -0500
+++ b/Makefile.am	Tue Feb 22 12:59:18 2011 -0500
@@ -109,8 +109,8 @@ endif
 	${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
 
 install-data-local:
-	${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
-	${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(prefix)/man/man1
+	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
+	${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
 	${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
 if ENABLE_DOCS
 	${mkinstalldirs} $(DESTDIR)$(htmldir)
@@ -134,7 +134,7 @@ uninstall-local:
 	rm -f $(DESTDIR)$(datadir)/$(PAKCAGE_NAME)/netx.jar
 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jnlp
 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/about.jar
-	rm -f $(DESTDIR)$(prefix)/man/man1/javaws.1
+	rm -f $(DESTDIR)$(mandir)/man1/javaws.1
 	rm -f $(DESTDIR)$(bindir)/javaws
 	rm -f $(DESTDIR)$(bindir)/itweb-settings
 	rm -rf $(DESTDIR)$(htmldir)