Changeset b75671d for protocols/skype/Makefile

Timestamp:

2015-06-17T22:47:26Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

b441614

Parents:

d832164 (diff), 2f99f23 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master' into parson

File:

• protocols/skype/Makefile (modified) (3 diffs)

protocols/skype/Makefile

@@ -7 +7 @@
 INSTALL = install
 
-
-ifdef ASCIIDOC
-MANPAGES = skyped.1
-else
-MANPAGES =
-endif
-
-all: $(MANPAGES)
-
+all:
 clean:
-        rm -f $(MANPAGES)
 
 # take this from the kernel
@@ -26 +17 @@
         ./test.py
 
-doc: $(MANPAGES)
-
-install-doc: doc
-ifdef ASCIIDOC
+install-doc:
         $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
-        $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
-endif
+        $(INSTALL) -m644 $(_SRCDIR_)skyped.1 $(DESTDIR)$(MANDIR)/man1
 
 uninstall-doc:
@@ -38 +25 @@
 
 %.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
-        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $<
+        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage $<