tschwery/alock
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for #13, bug in 'make install' when no 'asciidoc' is installed

Browse source 
--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4086
This commit is contained in:
mathias.gumz 2008-11-04 07:02:34 +00:00
parent 786c7bada6
commit 3a17f9f123
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.txt
View file

@ -1,7 +1,11 @@
Version 1.0 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: 2008-10-08:
* improved visual feedback * improved visual feedback (#12)
2008-10-04: 2008-10-04:
* first version with visual feedback (still rough) * first version with visual feedback (still rough)

22
GNUmakefile
View file

@ -18,13 +18,24 @@ distclean:
$(MAKE) -C src distclean $(MAKE) -C src distclean
rm -f config.mk config.log tmp.c rm -f config.mk config.log tmp.c
ifdef WITH_DOCS
install : alock docs
else
install : alock install : alock
endif
mkdir -p $(DESTDIR)$(prefix)/bin/ mkdir -p $(DESTDIR)$(prefix)/bin/
cp -fv src/alock $(DESTDIR)$(prefix)/bin/alock cp -fv src/alock $(DESTDIR)$(prefix)/bin/alock
chmod 755 $(DESTDIR)$(prefix)/bin/alock chmod 755 $(DESTDIR)$(prefix)/bin/alock
mkdir -p $(DESTDIR)$(prefix)/man/man1/ @if [ -f alock.1 ]; then \
cp -fv alock.1 $(DESTDIR)$(prefix)/man/man1/alock.1 mkdir -p $(DESTDIR)$(prefix)/man/man1/ ;\
chmod 444 $(DESTDIR)$(prefix)/man/man1/alock.1 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 mkdir -p $(DESTDIR)$(prefix)/share/alock/xcursors
cp -fv contrib/xcursor-alock contrib/xcursor-gentoo \ cp -fv contrib/xcursor-alock contrib/xcursor-gentoo \
contrib/xcursor-fluxbox contrib/xcursor-pekwm \ 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/README.txt
chmod 444 $(DESTDIR)$(prefix)/share/alock/LICENSE.txt chmod 444 $(DESTDIR)$(prefix)/share/alock/LICENSE.txt
chmod 444 $(DESTDIR)$(prefix)/share/alock/CHANGELOG.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 ",-------------------------------------------------,"; \
echo "| it seems that you have compiled 'alock' with |"; \ echo "| it seems that you have compiled 'alock' with |"; \
echo "| 'shadow' support. to use that binary you have |"; \ echo "| 'shadow' support. to use that binary you have |"; \
@ -57,6 +68,8 @@ install : alock
alock : alock :
$(MAKE) -C src $(MAKE) -C src
ifdef WITH_DOCS
ASCIIDOC := asciidoc ASCIIDOC := asciidoc
XMLTO := xmlto XMLTO := xmlto
FOP := fop FOP := fop
@ -75,4 +88,5 @@ alock.html : alock.txt
alock.pdf : alock.xml alock.pdf : alock.xml
$(XMLTO) fo $< && $(FOP) $(@:.pdf=.fo) $@ $(XMLTO) fo $< && $(FOP) $(@:.pdf=.fo) $@
endif