Separate binary-arch and binary-indep rules.
This commit is contained in:
Carlos Maddela
78
debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch
vendored
Normal file
78
debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch
vendored
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
From: Carlos Maddela <e7appew@gmail.com>
|
||||||
|
Date: Thu, 22 Dec 2016 02:20:30 +1100
|
||||||
|
Subject: Don't build and install documentation automatically.
|
||||||
|
|
||||||
|
Description: Don't build and install documentation automatically.
|
||||||
|
This allows for better control over binary-arch and binary-indep builds.
|
||||||
|
Author: Carlos Maddela <e7appew@gmail.com>
|
||||||
|
Origin: vendor
|
||||||
|
Forwarded: not-needed
|
||||||
|
Last-Update: 2016-12-21
|
||||||
|
---
|
||||||
|
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||||
|
---
|
||||||
|
GNUmakefile.template | 34 ++++++++++++++++++----------------
|
||||||
|
1 file changed, 18 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/GNUmakefile.template b/GNUmakefile.template
|
||||||
|
index 10e4524..dd91bf3 100644
|
||||||
|
--- a/GNUmakefile.template
|
||||||
|
+++ b/GNUmakefile.template
|
||||||
|
@@ -68,7 +68,7 @@ OFILES = $(CFG_OFILES)
|
||||||
|
@echo "Compiling:" $*.c
|
||||||
|
@$(CC) $(COPTS) -c $*.c
|
||||||
|
|
||||||
|
-all: time-stamp dvdisaster images
|
||||||
|
+all: time-stamp dvdisaster
|
||||||
|
|
||||||
|
# Building the dvdisaster binary
|
||||||
|
|
||||||
|
@@ -310,24 +310,10 @@ show:
|
||||||
|
.PHONY : www www-images
|
||||||
|
.PHONY : srcdist windist
|
||||||
|
|
||||||
|
-install: dvdisaster images
|
||||||
|
+install: dvdisaster
|
||||||
|
@echo "Installing package..."
|
||||||
|
install -d $(BUILDROOT)$(BINDIR)
|
||||||
|
install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
|
||||||
|
- install -d $(BUILDROOT)$(DOCSUBDIR)
|
||||||
|
- for i in $(DOC_LOCALES); do \
|
||||||
|
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
|
||||||
|
- (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
|
||||||
|
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
|
||||||
|
- (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
|
||||||
|
- install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
|
||||||
|
- (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
|
||||||
|
- done
|
||||||
|
- install -d $(BUILDROOT)$(DOCSUBDIR)/images
|
||||||
|
- cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
|
||||||
|
-# cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
|
||||||
|
- install -d $(BUILDROOT)$(DOCSUBDIR)/include
|
||||||
|
- cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
|
||||||
|
install -d $(BUILDROOT)$(MANDIR)/man1
|
||||||
|
install -d $(BUILDROOT)$(MANDIR)/cs/man1
|
||||||
|
install -d $(BUILDROOT)$(MANDIR)/de/man1
|
||||||
|
@@ -351,6 +337,22 @@ install: dvdisaster images
|
||||||
|
done \
|
||||||
|
fi
|
||||||
|
|
||||||
|
+install-doc: images
|
||||||
|
+ install -d $(BUILDROOT)$(DOCSUBDIR)
|
||||||
|
+ for i in $(DOC_LOCALES); do \
|
||||||
|
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
|
||||||
|
+ (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
|
||||||
|
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
|
||||||
|
+ (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
|
||||||
|
+ install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
|
||||||
|
+ (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
|
||||||
|
+ done
|
||||||
|
+ install -d $(BUILDROOT)$(DOCSUBDIR)/images
|
||||||
|
+ cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
|
||||||
|
+# cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
|
||||||
|
+ install -d $(BUILDROOT)$(DOCSUBDIR)/include
|
||||||
|
+ cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
|
||||||
|
+
|
||||||
|
uninstall:
|
||||||
|
@echo "Uninstalling package..."
|
||||||
|
rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
|
||||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@@ -12,3 +12,4 @@
|
|||||||
13-fix-missing-language-field-in-po-files.patch
|
13-fix-missing-language-field-in-po-files.patch
|
||||||
14-make-builds-reproducible.patch
|
14-make-builds-reproducible.patch
|
||||||
15-show-new-pkg-tracker.patch
|
15-show-new-pkg-tracker.patch
|
||||||
|
16-remove-auto-build-of-doco-from-install-rule.patch
|
||||||
|
|||||||
13
debian/rules
vendored
13
debian/rules
vendored
@@ -16,5 +16,14 @@ override_dh_auto_configure:
|
|||||||
--docsubdir=dvdisaster-doc/html \
|
--docsubdir=dvdisaster-doc/html \
|
||||||
--with-embedded-src-path=no
|
--with-embedded-src-path=no
|
||||||
|
|
||||||
override_dh_auto_install:
|
override_dh_auto_build-arch:
|
||||||
dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp
|
make all
|
||||||
|
|
||||||
|
override_dh_auto_build-indep:
|
||||||
|
make images
|
||||||
|
|
||||||
|
override_dh_auto_install-arch:
|
||||||
|
dh_auto_install -a -- BUILDROOT=$(CURDIR)/debian/tmp
|
||||||
|
|
||||||
|
override_dh_auto_install-indep:
|
||||||
|
make install-doc BUILDROOT=$(CURDIR)/debian/tmp
|
||||||
|
|||||||
Reference in New Issue
Block a user