summaryrefslogtreecommitdiff
path: root/buildlib
diff options
context:
space:
mode:
Diffstat (limited to 'buildlib')
-rw-r--r--buildlib/configure.mak29
-rw-r--r--buildlib/debiandoc.mak6
-rw-r--r--buildlib/defaults.mak2
-rw-r--r--buildlib/po4a_manpage.mak4
4 files changed, 36 insertions, 5 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak
index c0d8e3c76..68d0535b4 100644
--- a/buildlib/configure.mak
+++ b/buildlib/configure.mak
@@ -12,15 +12,42 @@
# It would be a fairly good idea to run this after a cvs checkout.
BUILDDIR=build
-.PHONY: startup
+.PHONY: startup missing-config-files
startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
# use the files provided from the system instead of carry around
# and use (most of the time outdated) copycats
+ifeq (file-okay,$(shell test -r buildlib/config.sub && echo 'file-okay'))
+buildlib/config.sub:
+else
+ ifeq (file-okay,$(shell test -r /usr/share/misc/config.sub && echo 'file-okay'))
buildlib/config.sub:
ln -sf /usr/share/misc/config.sub buildlib/config.sub
+ else
+buildlib/config.sub: missing-config-files
+ endif
+endif
+
+ifeq (file-okay,$(shell test -r buildlib/config.guess && echo 'file-okay'))
+buildlib/config.guess:
+else
+ ifeq (file-okay,$(shell test -r /usr/share/misc/config.guess && echo 'file-okay'))
buildlib/config.guess:
ln -sf /usr/share/misc/config.guess buildlib/config.guess
+ else
+buildlib/config.guess: missing-config-files
+ endif
+endif
+
+missing-config-files:
+ @echo "APT needs 'config.guess' and 'config.sub' in buildlib/ for configuration."
+ @echo "On Debian systems these are available in the 'autotools-dev' package."
+ @echo
+ @echo "The latest versions can be acquired from the upstream git repository:"
+ @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD"
+ @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD"
+ exit 100
+
configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
autoconf
diff --git a/buildlib/debiandoc.mak b/buildlib/debiandoc.mak
index a97af0caf..7e22467cf 100644
--- a/buildlib/debiandoc.mak
+++ b/buildlib/debiandoc.mak
@@ -14,13 +14,15 @@ LOCAL := debiandoc-$(firstword $(SOURCE))
$(LOCAL)-HTML := $(addsuffix .html,$(addprefix $(DOC)/,$(basename $(SOURCE))))
$(LOCAL)-TEXT := $(addsuffix .text,$(addprefix $(DOC)/,$(basename $(SOURCE))))
+debiandoc:
+
#---------
# Rules to build HTML documentations
ifdef DEBIANDOC_HTML
# Install generation hooks
-doc: $($(LOCAL)-HTML)
+debiandoc: $($(LOCAL)-HTML)
veryclean: veryclean/html/$(LOCAL)
vpath %.sgml $(SUBDIRS)
@@ -42,7 +44,7 @@ endif
ifdef DEBIANDOC_TEXT
# Install generation hooks
-doc: $($(LOCAL)-TEXT)
+debiandoc: $($(LOCAL)-TEXT)
veryclean: veryclean/text/$(LOCAL)
vpath %.sgml $(SUBDIRS)
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 7b084f4b9..5b970876a 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -121,7 +121,7 @@ MKDIRS := $(BIN)
all: dirs binary doc
binary: library program
maintainer-clean dist-clean distclean pristine sanity: veryclean
-startup headers library clean veryclean program test update-po manpages:
+startup headers library clean veryclean program test update-po manpages debiandoc:
veryclean:
echo Very Clean done for $(SUBDIR)
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 1dedd0dcd..09eca0ec2 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -13,6 +13,8 @@
SOURCE = $(patsubst %.xml,%,$(wildcard *.$(LC).?.xml))
INCLUDES = apt.ent apt-verbatim.ent
+manpages:
+
# Do not use XMLTO, build the manpages directly with XSLTPROC
ifdef XSLTPROC
@@ -22,7 +24,7 @@ LOCAL := po4a-manpage-$(firstword $(SOURCE))
$(LOCAL)-LIST := $(SOURCE)
# Install generation hooks
-doc: $($(LOCAL)-LIST)
+manpages: $($(LOCAL)-LIST)
veryclean: veryclean/$(LOCAL)
apt-verbatim.ent: ../apt-verbatim.ent