From f8840edb77f083c1d3a653bb4edb0490d53eab2c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 14:34:37 +0100
Subject: Merging upstream version 0.5.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 Makefile.in | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 8c5f93c..1d05051 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ AR = ar
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -m 755
 INSTALL_DATA = $(INSTALL) -p -m 644
+INSTALL_DIR = $(INSTALL) -d -m 755
 LDCONFIG = ldconfig
 SHELL = /bin/sh
 
@@ -79,8 +80,8 @@ check : all $(VPATH)/testsuite/check.sh
 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
 
 install : all install-info
-	if test ! -d $(DESTDIR)$(includedir) ; then $(INSTALL) -d $(DESTDIR)$(includedir) ; fi
-	if test ! -d $(DESTDIR)$(libdir) ; then $(INSTALL) -d $(DESTDIR)$(libdir) ; fi
+	if test ! -d $(DESTDIR)$(includedir) ; then $(INSTALL_DIR) $(DESTDIR)$(includedir) ; fi
+	if test ! -d $(DESTDIR)$(libdir) ; then $(INSTALL_DIR) $(DESTDIR)$(libdir) ; fi
 	$(INSTALL_DATA) $(VPATH)/$(pkgname).h $(DESTDIR)$(includedir)/$(pkgname).h
 	$(INSTALL_DATA) ./$(libname).a $(DESTDIR)$(libdir)/$(libname).a
 	if test -n "$(progname_shared)" ; then \
@@ -94,10 +95,14 @@ install : all install-info
 	fi
 
 install-info :
-	if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi
+	if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL_DIR) $(DESTDIR)$(infodir) ; fi
 	$(INSTALL_DATA) $(VPATH)/doc/$(pkgname).info $(DESTDIR)$(infodir)/$(pkgname).info
 	-install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(pkgname).info
 
+install-man :
+	if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi
+	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1
+
 install-strip : all
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
@@ -108,9 +113,12 @@ uninstall : uninstall-info
 	-rm -f $(DESTDIR)$(libdir)/$(libname).so.$(pkgversion)
 
 uninstall-info :
-	-install-info --remove $(DESTDIR)$(infodir)/$(pkgname).info $(DESTDIR)$(infodir)/dir
+	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(pkgname).info
 	-rm -f $(DESTDIR)$(infodir)/$(pkgname).info
 
+uninstall-man :
+	-rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
+
 dist :
 	ln -sf $(VPATH) $(DISTNAME)
 	tar -cvf $(DISTNAME).tar \
@@ -132,7 +140,7 @@ dist :
 	lzip -v -9 $(DISTNAME).tar
 
 clean :
-	-rm -f $(progname) $(progname)_profiled $(lib_objs) $(objs) *.a
+	-rm -f $(progname) $(progname)_profiled $(objs) $(lib_objs) *.a
 	-rm -f $(progname)_shared $(sh_lib_objs) *.so.$(pkgversion)
 
 distclean : clean
-- 
cgit v1.2.3