diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
| commit | 6c1f5d2c3c8df164e78dda8f24d28667634403e1 (patch) | |
| tree | d711a52cf5a92a13b87f248307f5521846a7dbcf /buildlib | |
| parent | aa2218b25cb29e8c0677f0f3ede098583c7ae49f (diff) | |
| parent | 0baf849d81814fce59d86eecccbe624c8aaf0456 (diff) | |
merged from David, uncommited the previous i18n commit first as its part of the merge from David already but for some reason bzr is confused and gives a gazillion of conflicts in doc/po/de.po without the uncommit first
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/configure.mak | 11 | ||||
| -rw-r--r-- | buildlib/copy.mak | 2 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 2 | ||||
| -rw-r--r-- | buildlib/manpage.mak | 3 | ||||
| -rw-r--r-- | buildlib/po4a_manpage.mak | 8 | ||||
| -rw-r--r-- | buildlib/podomain.mak | 6 |
6 files changed, 18 insertions, 14 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 310c2600c..c0d8e3c76 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -20,16 +20,15 @@ startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTE buildlib/config.sub: ln -sf /usr/share/misc/config.sub buildlib/config.sub buildlib/config.guess: - ln -sf /usr/share/misc/config.guess buildlib/config.guess + ln -sf /usr/share/misc/config.guess buildlib/config.guess configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub autoconf aclocal.m4: $(wildcard buildlib/*.m4) aclocal -I buildlib - + $(BUILDDIR)/config.status: configure - /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) + /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure) - -$(addprefix $(BUILDDIR)/,$(CONVERTED)): - (cd $(BUILDDIR) && ./config.status) + +$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status diff --git a/buildlib/copy.mak b/buildlib/copy.mak index 3ae11a7eb..e8fe43deb 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL) MKDIRS += $(dir $($(LOCAL)-LIST)) -$($(LOCAL)-LIST) : $(TO)/% : % +$($(LOCAL)-LIST) : $(TO)/% : % dirs echo Installing $< to $(@D) cp $< $(@D) diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c10813e9d..7b084f4b9 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: +startup headers library clean veryclean program test update-po manpages: veryclean: echo Very Clean done for $(SUBDIR) diff --git a/buildlib/manpage.mak b/buildlib/manpage.mak index 6cdf73ccf..063841d86 100644 --- a/buildlib/manpage.mak +++ b/buildlib/manpage.mak @@ -14,7 +14,8 @@ LOCAL := manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(addprefix $(DOC)/,$(SOURCE)) # Install generation hooks -doc: $($(LOCAL)-LIST) +doc: manpages +manpages: $($(LOCAL)-LIST) veryclean: veryclean/$(LOCAL) MKDIRS += $(DOC) diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 404bb57a5..1dedd0dcd 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=../manpage-style.xsl +STYLESHEET=manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) @@ -28,7 +28,11 @@ veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent cp ../apt-verbatim.ent . -$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES) +manpage-style.xsl: ../manpage-style.xsl + sed "/<!-- LANGUAGE -->/ i\ +<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../manpage-style.xsl > manpage-style.xsl + +$($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index bb1c77e47..d46652520 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -11,9 +11,9 @@ MY_DOMAIN := $(APT_DOMAIN) endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) -$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile - (echo $(SRC) | xargs -n1 echo) > $@ +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: $(addprefix $(BASE)/$(SUBDIR)/,$(SOURCE)) +$(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs + (echo $(addprefix $(SUBDIR)/,$(SOURCE)) | xargs -n1 echo) > $@ startup binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) |