Ignore:
Timestamp:
2015-05-28T04:12:23Z (9 years ago)
Author:
dequis <dx@…>
Children:
d2d2b80
Parents:
ec8b369 (diff), 3d31618 (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 branch 'develop' into feat/hip-cat

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/Makefile

    rec8b369 ra1d30c5  
    77INSTALL = install
    88
    9 
    10 ifdef ASCIIDOC
    11 MANPAGES = skyped.1
    12 else
    13 MANPAGES =
    14 endif
    15 
    16 all: $(MANPAGES)
    17 
     9all:
    1810clean:
    19         rm -f $(MANPAGES)
    2011
    2112# take this from the kernel
     
    2920
    3021install-doc: doc
    31 ifdef ASCIIDOC
    3222        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
    3323        $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
    34 endif
    3524
    3625uninstall-doc:
     
    3827
    3928%.1: $(_SRCDIR_)%.txt $(_SRCDIR_)asciidoc.conf
    40         a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage -D . $<
     29        a2x --asciidoc-opts="-f $(_SRCDIR_)asciidoc.conf" -a bee_date=$(DATE) -f manpage $<
Note: See TracChangeset for help on using the changeset viewer.