From ccc055618efcb3263cbc58162d19644d58d17a05 Mon Sep 17 00:00:00 2001
From: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Date: Tue, 14 Jun 2011 09:57:50 +0000
Subject: rapid-tunneling: extra files in tarball, README.html

* Default target is now to create README.html from README.
* Some files were left out of the tarball.


git-svn-id: svn+ssh://xorcom/home/svn/debs/components/rapid-tunneling@9422 283159da-0705-0410-b60c-f2062b4bb6ad
---
 Makefile | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 6dfedcd..9c070cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 PACKAGE	= rapid-tunneling
 SPEC	= rapid-tunneling.spec
 
-SCRIPTS = rapid-tunneling rapid-tunneling-status rtadm rt-from-remote
+SCRIPTS = rapid-tunneling rapid-tunneling-status rtadm rt-from-remote \
+	  rt_handle_uploaded_key
 CONFIGS = rtadm.config support_env rapid-tunneling.conf gui.htpasswd rtadm.bash_completion 
 GUI	= gui
-SOURCES = Makefile $(SPEC) $(SCRIPTS) $(CONFIGS) $(GUI) \
-  .placeholder rapid-tunneling.8 rapid-tunneling-status.8
+DOCS	= README ChangeLog rapid-tunneling.8 rapid-tunneling-status.8
+SOURCES = Makefile $(SPEC) $(SCRIPTS) $(CONFIGS) $(GUI) .placeholder $(DOCS)
 SBINDIR	= /usr/sbin
 MANDIR	= /usr/share/man/man8
 BINDIR	= /usr/share/rapid-tunneling/bin
@@ -15,7 +16,9 @@ VER	= $(shell awk '/^Version: / {print $$2}' $(SPEC)| head -n 1)
 RPM_REL	= $(shell awk '/^Release: / {print $$2}' $(SPEC)| head -n 1)
 DEB_VER = $(shell head -n 1 debian/changelog | sed -n 's/.*(\([0-9.-]*\)).*/\1/p' | cut -d- -f1)
 
-all: rpm deb
+all: docs
+
+packs: rpm deb
 
 rpm: checkver $(SPEC) SOURCES/$(PACKAGE)-$(VER).tar.gz
 	mkdir -p BUILD RPMS SOURCES SRPMS
@@ -43,6 +46,14 @@ ifneq ($(VER),$(DEB_VER))
 	@echo "Version in $(SPEC) ($(VER)) conflicts with version in debian/changelog ($(DEB_VER))"; exit 1
 endif
 
+docs: README.html
+
+README.html: README
+	asciidoc -n -a toc README
+
+clean:
+	rm -f README.html
+
 install:
 	install -m 755 -d $(DESTDIR)$(SBINDIR)
 	install -m 755 rapid-tunneling $(DESTDIR)$(SBINDIR)
@@ -67,6 +78,4 @@ install:
 	install -m 755 -d $(DESTDIR)/etc/bash_completion.d
 	install -m 644 rtadm.bash_completion $(DESTDIR)/etc/bash_completion.d/rtadm
 
-.PHONY: clean dummy
-dummy:
-clean:
+.PHONY: clean
-- 
cgit v1.2.3