diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-11 12:12:24 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2011-12-11 12:12:24 +0000 |
| commit | e46db53456e89bcf9e0baf4c093c4b02e082819a (patch) | |
| tree | 7de1a7dfc2458eaaa22cfd5d48f20783c9cc5d3a | |
| parent | 8b39b1a3684d80c228ae81347e3b62679cc45f5d (diff) | |
Another packaging fix: Don't put skyped manpage in bitlbee-common.
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | protocols/skype/Makefile | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/debian/rules b/debian/rules index 9356cb79..57d60090 100755 --- a/debian/rules +++ b/debian/rules @@ -74,6 +74,9 @@ install: build mkdir -p debian/bitlbee-plugin-skype/usr 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 ln -sf debian/bitlbee.prerm debian/bitlbee-libpurple.prerm diff --git a/protocols/skype/Makefile b/protocols/skype/Makefile index 1a07cd80..e048e0bc 100644 --- a/protocols/skype/Makefile +++ b/protocols/skype/Makefile @@ -7,6 +7,8 @@ VERSION = 0.9.0 DATE := $(shell date +%Y-%m-%d) # latest stable BITLBEE_VERSION = 3.0.1 +INSTALL = install +ASCIIDOC = yes ifeq ($(ASCIIDOC),yes) MANPAGES = skyped.1 @@ -27,11 +29,7 @@ ifeq ($(BITLBEE),yes) $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) $(SRCDIR)skype.c $(LDFLAGS) 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) $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir) @@ -56,7 +54,7 @@ clean: rm -f $(LIBS) $(MANPAGES) distclean: clean - rm -f config.log config.mak config.status skyped.1 + rm -f config.log config.mak config.status $(MANPAGES) autoclean: distclean rm -rf aclocal.m4 autom4te.cache configure install-sh @@ -82,11 +80,13 @@ release: gpg --comment "See http://vmiklos.hu/gpg/ for info" \ -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: rm -f $(DESTDIR)$(MANDIR)/man1/skyped.1* @@ -104,4 +104,4 @@ AUTHORS: .git/refs/heads/master %.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 . $< |