summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in7
-rw-r--r--THANKS1
-rw-r--r--debian/changelog6
-rwxr-xr-xhelp2man.PL2
4 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 121b4cc..334657e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,12 +39,13 @@ vpath_file = $$($(PERL) -e 'print +(grep -f, map "$$_/$$ARGV[0]", \
all: $(target) man info @extra_make_all@
install: all install_base @extra_make_install@
-install_base:
+install_dirs:
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+install_base: install_dirs
$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)
$(INSTALL_DATA) $(call vpath_file,$(target).1) $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(call vpath_file,/$(target).info) \
@@ -56,10 +57,10 @@ install_base:
$(DESTDIR)$(infodir)/$(target).info; \
fi
-install_preload: preload
+install_preload: install_dirs preload
$(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(libdir)
-install_l10n: msg_l10n man_l10n
+install_l10n: install_dirs msg_l10n man_l10n
for lang in $(LINGUAS); \
do \
$(MKINSTALLDIRS) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
diff --git a/THANKS b/THANKS
index 56ca368..1a14514 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Mo DeJong <mdejong@cygnus.com>
Akim Demaille <demaille@inf.enst.fr>
Paul Eggert <eggert@twinsun.com>
Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
+Mike Frysinger <vapier@gentoo.org>
Roland Huebner <rh@pelikan.cologne.de>
Thomas Huriaux <thomas.huriaux@kti.ae.poznan.pl>
Simon Josefsson <simon@josefsson.org>
diff --git a/debian/changelog b/debian/changelog
index 61bf8d1..ece5f3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+help2man (1.38.3) unstable; urgency=low
+
+ * Apply patch from Mike Frysinger to allow "make install -j" to work.
+
+ -- Brendan O'Dea <bod@debian.org> Sun, 04 Jul 2010 12:17:17 +1000
+
help2man (1.38.2) unstable; urgency=low
* Update Finnish translation (thanks to Tommi Vainikainen).
diff --git a/help2man.PL b/help2man.PL
index 7f61b31..de4e8d4 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use 5.008;
use Config;
use Getopt::Long;
-my ($program, $version) = ('help2man', '1.38.2');
+my ($program, $version) = ('help2man', '1.38.3');
my %opts;
die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n"