From 3a17f9f1235279b9a3d506970efdc704fb424847 Mon Sep 17 00:00:00 2001
From: "mathias.gumz" <none@none>
Date: Tue, 4 Nov 2008 07:02:34 +0000
Subject: [PATCH] fix for #13, bug in 'make install' when no 'asciidoc' is
 installed

--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4086
---
 CHANGELOG.txt |  6 +++++-
 GNUmakefile   | 22 ++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a178af7..3602967 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,11 @@
 Version 1.0
 ----------------------------------------------------------------------
+2008-11-04:
+	* fix for #13, problems with 'make install' when asciidoc is not
+	  installed and thus creates no 'alock.1'
+
 2008-10-08:
-	* improved visual feedback
+	* improved visual feedback (#12)
 
 2008-10-04:
 	* first version with visual feedback (still rough)
diff --git a/GNUmakefile b/GNUmakefile
index b188b13..e5a157c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -18,13 +18,24 @@ distclean:
 	$(MAKE) -C src distclean
 	rm -f config.mk config.log tmp.c
 
+ifdef WITH_DOCS
+install : alock docs
+else
 install : alock
+endif
 	mkdir -p $(DESTDIR)$(prefix)/bin/
 	cp -fv src/alock $(DESTDIR)$(prefix)/bin/alock
 	chmod 755 $(DESTDIR)$(prefix)/bin/alock
-	mkdir -p $(DESTDIR)$(prefix)/man/man1/
-	cp -fv alock.1 $(DESTDIR)$(prefix)/man/man1/alock.1
-	chmod 444 $(DESTDIR)$(prefix)/man/man1/alock.1
+	@if [ -f alock.1 ]; then \
+		mkdir -p $(DESTDIR)$(prefix)/man/man1/ ;\
+		cp -fv alock.1 $(DESTDIR)$(prefix)/man/man1/alock.1 ;\
+		chmod 444 $(DESTDIR)$(prefix)/man/man1/alock.1 ;\
+	else \
+		echo ",-----------------------------------------------------------," ;\
+		echo "| not installing the documentation because it was not built |" ;\
+		echo "| install 'asciidoc' and run './configure && make' again    |" ; \
+		echo "\`-----------------------------------------------------------'" ;\
+	fi
 	mkdir -p $(DESTDIR)$(prefix)/share/alock/xcursors
 	cp -fv contrib/xcursor-alock contrib/xcursor-gentoo \
 		contrib/xcursor-fluxbox contrib/xcursor-pekwm \
@@ -41,7 +52,7 @@ install : alock
 	chmod 444 $(DESTDIR)$(prefix)/share/alock/README.txt
 	chmod 444 $(DESTDIR)$(prefix)/share/alock/LICENSE.txt
 	chmod 444 $(DESTDIR)$(prefix)/share/alock/CHANGELOG.txt
-	@if `src/alock -auth list | grep passwd > /dev/null`; then      \
+	@if `./src/alock -auth list | grep passwd > /dev/null`; then      \
 		echo ",-------------------------------------------------,"; \
 		echo "| it seems that you have compiled 'alock' with    |"; \
 		echo "| 'shadow' support. to use that binary you have   |"; \
@@ -57,6 +68,8 @@ install : alock
 alock :
 	$(MAKE) -C src
 
+ifdef WITH_DOCS
+
 ASCIIDOC := asciidoc
 XMLTO := xmlto
 FOP := fop
@@ -75,4 +88,5 @@ alock.html : alock.txt
 alock.pdf : alock.xml
 	$(XMLTO) fo $< && $(FOP) $(@:.pdf=.fo) $@ 
 
+endif