From 61af55884cfcb2ac70f42a9fc8dc68b3c343b402 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aalto@cante.net>
Date: Wed, 5 May 2010 03:13:42 +0300
Subject: Import Debian changes 3b1-3.1

slib (3b1-3.1) unstable; urgency=low

  [ Jari Aalto ]
  * Non-maintainer upload.
    - Move to packaging format "3.0 (quilt)".
  * debian/compat
    - Update to 7.
  * debian/control
    - (Build-Depends-Indep): Update to debhelper 7.1.
    - (Depends): add ${misc:Depends}.
    - (Homepage): New field.
    - (Standards-Version): update to 3.8.4.
    + slib
      - (Depends): add ${misc:Depends}, install-info.
      - (Priority): remove inherited field.
      - (Section): remove inherited field.
  * debian/copyright
    - Update "more information" URL.
  * debian/doc-base
    - (Section): Remove obsolete top-level "Apps/".
  * debian/prerm
    - Remove path component from commands.
    - Remove obsolete install-docs, install-info commands.
  * debian/postinst
    - Remove obsolete install-docs, install-info commands.
    - Remove path component from commands.
  * debian/source/format
    - New file.
  * debian/watch
    - New file.

  [ Hideki Yamane (Debian-JP) <henrich@debian.or.jp> ]
  * debian/rules
    - (build): Rewrite make calls.
    - (binary-indep:): install *.html not slib/*.html to fix. It is
      useless to specify htmllib (FTBFS; Closes: #552911).
---
 debian/rules | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 64b0b29..eb91909 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,16 +17,14 @@ INSTALL_PROGRAM =$(INSTALL) -m 755 -o root -g root
 INSTALL_DATA =$(INSTALL) -m 644 -o root -g root
 INSTALL_MAN =$(INSTALL) -m 444 -o root -g root
 
-# Override definitions in upstream Makefile thus:
-prefix = debian/tmp/usr
-htmldir = slib/
 TEXI2HTML = texi2html --split chapter --verbose
-makeoverrides = "prefix=$(prefix)" "htmldir=$(htmldir)" "TEXI2HTML=$(TEXI2HTML)"
 
 build:
 	$(checkdir)
-	make $(makeoverrides)
-	make html $(makeoverrides)
+	# Run the "default target", whatever it be
+	$(MAKE) TEXI2HTML="$(TEXI2HTML)"
+	# Then run target "html"
+	$(MAKE) TEXI2HTML="$(TEXI2HTML)" html
 	touch build
 
 clean:
@@ -75,7 +73,7 @@ binary-indep: checkroot build
 	gzip -9v debian/tmp/usr/share/doc/slib/README
 	$(INSTALL_DATA) FAQ debian/tmp/usr/share/doc/slib
 	gzip -9v debian/tmp/usr/share/doc/slib/FAQ
-	$(INSTALL_DATA) slib/*.html debian/tmp/usr/share/doc/slib
+	$(INSTALL_DATA) *.html debian/tmp/usr/share/doc/slib
 
 	ln -s . debian/tmp/usr/share/slib/init
 	$(INSTALL_DATA) *.init debian/tmp/usr/share/slib
-- 
cgit v1.2.3