Build make-doc, omit gmake (moved into make)

5 files changed, 17 insertions, 20 deletions

diff --git a/debian/control b/debian/control
index 468ae11..530bc9c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,15 @@ Priority: standard
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Standards-Version: 3.9.3
 Homepage: http://www.gnu.org/software/make/
-Build-Depends: debhelper (>=9), perl, libkstat-dev [illumos-any]
+Build-Depends: debhelper (>=9), perl,
+ libkstat-dev [illumos-any]
+Build-Depends-Indep: texi2html, texinfo
 
 Package: make
 Section: devel
 Priority: standard
 Suggests: make-doc
+Provides: gmake
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: An utility for Directing compilation.
@@ -22,19 +25,11 @@ Description: An utility for Directing compilation.
  files, based on dependency and processing rules. Indeed, Make is a
  general purpose dependency solver.
 
-Package: gmake
-Section: devel
-Priority: optional
-Architecture: any
-Depends: make, ${misc:Depends}
-Description: An utility for Directing compilation (compatibility package)
- GNU Make is an utility which controls the generation of executables and
- other target files of a program from the program's source files. It
- determines automatically which pieces of a large program need to be
- (re)created, and issues the commands to (re)create them. Make is not
- limited to programs and executable, it can be applied to any task
- where a set of target files must be created based on a set of input
- files, based on dependency and processing rules. Indeed, Make is a
- general purpose dependency solver.
- .
- This package only provides symbolic link from "make" to "gmake"
+Package: make-doc
+Section: doc
+Architecture: all
+Suggests: make
+Enhances: make
+Depends: dpkg (>= 1.15.4) | install-info
+Description: Documentation for the GNU "make" utility.
+
diff --git a/debian/make-doc.docs b/debian/make-doc.docs
new file mode 100644
index 0000000..1279bd2
--- /dev/null
+++ b/debian/make-doc.docs
@@ -0,0 +1,2 @@
+doc/*.html
+usr/share/info/make.info*
diff --git a/debian/make.install b/debian/make.install
index c8333e7..6a7b5d6 100644
--- a/debian/make.install
+++ b/debian/make.install
@@ -1,4 +1,3 @@
 usr/bin/make
-usr/share/info/make.info*
 usr/share/locale/*
 usr/share/man/man1/make.1
diff --git a/debian/gmake.links b/debian/make.links
index 2ded358..2ded358 100644
--- a/debian/gmake.links
+++ b/debian/make.links
diff --git a/debian/rules b/debian/rules
index 67b37ac..11b8163 100644..100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 %:
 	dh $@
 
-override_dh_installdocs:
-	dh_installdocs --link-doc=make
+override_dh_auto_build:
+	dh_auto_build
+	$(MAKE) -C doc