From 20c66a1eaef872dbfad4ba82d2ca1c74eb4c9818 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Sat, 01 Mar 2014 19:40:11 -0500
Subject: Merge branch 'feature/autoconf-and-automake'.

---
(limited to 'man')

diff --git a/man/local.mk b/man/local.mk
index 808e325..0e88e68 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-man1_srcs = \
+man1_sources = \
 	man/oh-installfiles.1in \
 	man/oh-strip.1in \
 	man/oh-fixperms.1in \
diff --git a/man/oh-architecture.1in b/man/oh-architecture.1in
index fbe42b2..73d6c0c 100644
--- a/man/oh-architecture.1in
+++ b/man/oh-architecture.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-architecture 1 \
-"2012-11-15" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-11-15" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-architecture \- Print build system architecture names.
diff --git a/man/oh-autobuild.1in b/man/oh-autobuild.1in
index a3a43bc..cb425dd 100644
--- a/man/oh-autobuild.1in
+++ b/man/oh-autobuild.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-autobuild 1 \
-"2012-11-14" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-11-14" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-autobuild \- Automatically build a package.
diff --git a/man/oh-autoclean.1in b/man/oh-autoclean.1in
index 1f45132..be80640 100644
--- a/man/oh-autoclean.1in
+++ b/man/oh-autoclean.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-autoclean 1 \
-"2012-11-14" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-11-14" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-autoclean \- Automatically clean up a package's built files.
diff --git a/man/oh-autoconfigure.1in b/man/oh-autoconfigure.1in
index ef19201..000da60 100644
--- a/man/oh-autoconfigure.1in
+++ b/man/oh-autoconfigure.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-autoconfigure 1 \
-"2012-11-15" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-11-15" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-autoconfigure \- Automatically configure a package to be built.
diff --git a/man/oh-autoinstall.1in b/man/oh-autoinstall.1in
index 10affef..6a14487 100644
--- a/man/oh-autoinstall.1in
+++ b/man/oh-autoinstall.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-autoinstall 1 \
-"2012-11-14" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-11-14" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-autoinstall \- Automatically install a package's data files.
diff --git a/man/oh-autotest.1in b/man/oh-autotest.1in
index dc3808b..4400d96 100644
--- a/man/oh-autotest.1in
+++ b/man/oh-autotest.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-autotest 1 \
-"2012-10-22" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-10-22" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-autotest \- Automatically run a package's test suites.
diff --git a/man/oh-fixperms.1in b/man/oh-fixperms.1in
index 70a3e9e..bc3addc 100644
--- a/man/oh-fixperms.1in
+++ b/man/oh-fixperms.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-fixperms 1 \
-"2012-10-22" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-10-22" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-fixperms \- Fix permissions and ownerships of data files.
diff --git a/man/oh-installfiles.1in b/man/oh-installfiles.1in
index 68434b9..9dd9615 100644
--- a/man/oh-installfiles.1in
+++ b/man/oh-installfiles.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-installfiles 1 \
-"2012-10-21" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-10-21" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-installfiles \- Install files into binary package data directories.
diff --git a/man/oh-strip.1in b/man/oh-strip.1in
index 52d75f3..02c46c0 100644
--- a/man/oh-strip.1in
+++ b/man/oh-strip.1in
@@ -1,6 +1,6 @@
 .\" Author: Patrick "P. J." McDermott
 .TH oh-strip 1 \
-"2012-10-21" "@@PACKAGE_NAME@@-@@PACKAGE_VERSION@@" "@@PACKAGE_DESCRIPTION@@"
+"2012-10-21" "@PACKAGE@ @PACKAGE_VERSION@" "@PACKAGE_NAME@"
 
 .SH NAME
 oh-strip \- Strip binary objects of symbols.
--
cgit v0.9.1