X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=debian%2Frules;h=440446042e8e859a7d674b1ecc9868de568876d7;hb=242907dcb6220a23b620f3314e96581b5b472a0d;hp=96f875af9131f666f515530d5ee3e2eeb217bebd;hpb=cb2e07351834ad17b2bb0b8668e13466e1058ca1;p=pkg%2Fabook.git

diff --git a/debian/rules b/debian/rules
index 96f875a..4404460 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # debian/rules for abook
-# copyright 2003-2009 by Gerfried Fuchs <rhonda@debian.at>
-# Licenced under BSD style
+# copyright 2003-2012 by Gerfried Fuchs <rhonda@debian.org>
+# Licenced under WTFPLv2
 
 PKG = abook
 TMP = $(CURDIR)/debian/$(PKG)
@@ -9,7 +9,7 @@ TMP = $(CURDIR)/debian/$(PKG)
 QUILT_STAMPFN = patch-stamp
 include /usr/share/quilt/quilt.make
 
-CFLAGS = -g -Wall
+CFLAGS = -g -Wall -std=gnu89
 INSTALL = install
 INSTALL_FILE    = $(INSTALL) -p    -oroot -groot -m644
 INSTALL_PROGRAM = $(INSTALL) -p    -oroot -groot -m755
@@ -43,7 +43,9 @@ clean: unpatch
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 
-build: build-stamp
+build: build-arch
+build-arch: build-stamp
+build-indep:
 build-stamp: patch-stamp
 	$(checkdir)
 	cp /usr/share/misc/config.guess /usr/share/misc/config.sub .
@@ -58,8 +60,7 @@ install: build
 	$(checkroot)
 	-rm -rf $(TMP)
 	$(INSTALL_DIR) $(TMP)
-	cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PKG)/examples \
-		usr/share/doc/$(PKG)/contrib
+	cd $(TMP) && $(INSTALL_DIR) usr/share/doc/$(PKG)/examples
 	$(MAKE) prefix=$(TMP)/usr install INSTALL_PROGRAM="$(INSTALL_PROGRAM)"
 	test "$(STRIP)" != true || strip \
 		--remove-section=.comment --remove-section=.note \
@@ -67,13 +68,10 @@ install: build
 	$(INSTALL_FILE) ChangeLog $(TMP)/usr/share/doc/$(PKG)/changelog
 	$(INSTALL_FILE) ANNOUNCE AUTHORS BUGS FAQ README THANKS TODO \
 		$(TMP)/usr/share/doc/$(PKG)
-	$(INSTALL_FILE) sample.abookrc contrib/mail2abook.py \
-		contrib/vcard2abook.pl $(TMP)/usr/share/doc/$(PKG)/examples
-	$(INSTALL_FILE) contrib/abook+vim/README contrib/abook+vim/mail.vim \
-		$(TMP)/usr/share/doc/$(PKG)/contrib
+	$(INSTALL_FILE) sample.abookrc \
+		$(TMP)/usr/share/doc/$(PKG)/examples
 	cd $(TMP)/usr/share && gzip -9 man/man1/abook.1 man/man5/abookrc.5 \
-		doc/$(PKG)/examples/mail2abook.py doc/$(PKG)/changelog \
-		doc/$(PKG)/contrib/mail.vim
+		doc/$(PKG)/changelog
 
 
 # Build architecture-independent files here.