Changeset e46db53

Timestamp:

2011-12-11T12:12:24Z (13 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:

• debian/rules (modified) (1 diff)
• protocols/skype/Makefile (modified) (5 diffs)

debian/rules

@@ -75 +75 @@
         mv debian/skyped/usr/lib debian/bitlbee-plugin-skype/usr
 
+        mkdir -p debian/skyped/usr/share/man/man1
+        mv debian/bitlbee-common/usr/share/man/man1/skyped* debian/skyped/usr/share/man/man1
+
 ifeq ($(BITLBEE_LIBPURPLE),1)
         $(MAKE) -C debian/build-libpurple install-bin DESTDIR=`pwd`/debian/bitlbee-libpurple

protocols/skype/Makefile

@@ -8 +8 @@
 # latest stable
 BITLBEE_VERSION = 3.0.1
+INSTALL = install
+ASCIIDOC = yes
 
 ifeq ($(ASCIIDOC),yes)
@@ -28 +30 @@
 endif
 
-install: all
-ifeq ($(ASCIIDOC),yes)
-        $(INSTALL) -d $(DESTDIR)$(mandir)/man1
-        $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(mandir)/man1
-endif
+install: all install-doc
 ifeq ($(BITLBEE),yes)
         $(INSTALL) -d $(DESTDIR)$(plugindir)
@@ -57 +55 @@
 
 distclean: clean
-        rm -f config.log config.mak config.status skyped.1
+        rm -f config.log config.mak config.status $(MANPAGES)
 
 autoclean: distclean
@@ -83 +81 @@
                 -ba bitlbee-skype-$(VERSION).tar.gz
 
-doc: skyped.1
+doc: $(MANPAGES)
 
-install-doc:
-        mkdir -p $(DESTDIR)$(MANDIR)/man1/
-        install -m 0644 $(SRCDIR)skyped.1 $(DESTDIR)$(MANDIR)/man1/
+install-doc: doc
+ifeq ($(ASCIIDOC),yes)
+        $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
+        $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
+endif
 
 uninstall-doc:
@@ -105 +105 @@
 %.1: $(SRCDIR)%.txt $(SRCDIR)asciidoc.conf
         a2x --asciidoc-opts="-f $(SRCDIR)asciidoc.conf" \
-                -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage $<
+                -a bs_version=$(VERSION) -a bs_date=$(DATE) -f manpage -D . $<