Changeset e46db53


Ignore:
Timestamp:
2011-12-11T12:12:24Z (7 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
877686b
Parents:
8b39b1a
Message:

Another packaging fix: Don't put skyped manpage in bitlbee-common.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/rules

    r8b39b1a re46db53  
    7575        mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
    7676
     77        mkdir -p debian/skyped/usr/share/man/man1
     78        mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1
     79
    7780ifeq ($(BITLBEE_LIBPURPLE),1)
    7881        $(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple
  • protocols/skype/Makefile

    r8b39b1a re46db53  
    88# latest stable
    99BITLBEE_VERSION = 3.0.1
     10INSTALL = install
     11ASCIIDOC = yes
    1012
    1113ifeq ($(ASCIIDOC),yes)
     
    2830endif
    2931
    30 install: all
    31 ifeq ($(ASCIIDOC),yes)
    32         $(INSTALL) -d $(DESTDIR)$(mandir)/man1
    33         $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(mandir)/man1
    34 endif
     32install: all install-doc
    3533ifeq ($(BITLBEE),yes)
    3634        $(INSTALL) -d $(DESTDIR)$(plugindir)
     
    5755
    5856distclean: clean
    59         rm -f config.log config.mak config.status skyped.1
     57        rm -f config.log config.mak config.status $(MANPAGES)
    6058
    6159autoclean: distclean
     
    8381                -ba bitlbee-skype-$(VERSION).tar.gz
    8482
    85 doc: skyped.1
     83doc: $(MANPAGES)
    8684
    87 install-doc:
    88         mkdir -p $(DESTDIR)$(MANDIR)/man1/
    89         install -m 0644 $(SRCDIR)skyped.1 $(DESTDIR)$(MANDIR)/man1/
     85install-doc: doc
     86ifeq ($(ASCIIDOC),yes)
     87        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
     88        $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
     89endif
    9090
    9191uninstall-doc:
     
    105105%.1: $(SRCDIR)%.txt $(SRCDIR)asciidoc.conf
    106106        a2x --asciidoc-opts="-f $(SRCDIR)asciidoc.conf" \
    107                 -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage $<
     107                -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $<
Note: See TracChangeset for help on using the changeset viewer.