Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put all .gmo and asciidoc-generated files into srcdir. 

This way they will always be in the same location, regardless of
building from tarball or source, and in or out of the srcdir.

.gmo fix adapted from patch by cazfi.

Closes #1473.
master
cybersphinx 2011-09-07 21:09:11 +02:00
parent 9a72ebd45f
commit 715a47e8a3
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/Makefile.am
View File

@ -67,15 +67,15 @@ dist_man6_MANS = \
warzone2100.6
warzone2100.6: warzone2100.6.asciidoc
$(A2X) -f manpage -D . $(srcdir)/warzone2100.6.asciidoc
$(A2X) -f manpage -D $(srcdir) $(srcdir)/warzone2100.6.asciidoc
quickstartguide.html: quickstartguide.asciidoc
$(A2X) -f xhtml -D . $(srcdir)/quickstartguide.asciidoc
$(A2X) -f xhtml -D $(srcdir) $(srcdir)/quickstartguide.asciidoc
if WKHTMLTOPDF_AVAILABLE
quickstartguide.pdf: quickstartguide.html
$(WKHTMLTOPDF) quickstartguide.html quickstartguide.pdf
$(WKHTMLTOPDF) $(srcdir)/quickstartguide.html $(srcdir)/quickstartguide.pdf
endif

6
pkg/nsis/Makefile.am
View File

@ -8,7 +8,7 @@ EXTRA_DIST = fonts.conf.wd_enable \
CLEANFILES=$(INSTALLERFILE)
if INSTALLER
GMOFILES = $(addprefix $(top_builddir)/po/,$(addsuffix .gmo,$(basename $(notdir $(wildcard $(top_srcdir)/po/*.po)))))
GMOFILES = $(addprefix $(top_srcdir)/po/,$(addsuffix .gmo,$(basename $(notdir $(wildcard $(top_srcdir)/po/*.po)))))
all: $(INSTALLERFILE)
@ -16,8 +16,8 @@ else
GMOFILES =
endif
$(top_builddir)/po/%.gmo: $(top_srcdir)/po/%.po
$(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/po $(notdir $@)
$(top_srcdir)/po/%.gmo: $(top_srcdir)/po/%.po
$(MAKE) $(AM_MAKEFLAGS) -C $(top_srcdir)/po $(notdir $@)
data:
$(MAKE) $(AM_MAKEFLAGS) -C ../../data/ all

6
pkg/nsis/warzone2100.nsi
View File

@ -208,9 +208,9 @@ Section $(TEXT_SecBase) SecBase
Push "Readme.en"
Push "Readme.en.txt"
Call unix2dos
File "${TOP_BUILDDIR}\doc\quickstartguide.html"
File "${TOP_BUILDDIR}\doc\quickstartguide.pdf"
File "${TOP_BUILDDIR}\doc\docbook-xsl.css"
File "${TOP_SRCDIR}\doc\quickstartguide.html"
File "${TOP_SRCDIR}\doc\quickstartguide.pdf"
File "${TOP_SRCDIR}\doc\docbook-xsl.css"
SetOutPath "$INSTDIR\doc\images"
File "${TOP_SRCDIR}\doc\images\*.*"

6
po/Makefile.in.in
View File

@ -91,8 +91,8 @@ CATALOGS = @CATALOGS@
.po.gmo:
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(builddir)" = . && cdcmd="" || cdcmd="cd $(builddir) && "; \
echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $(srcdir)/$${lang}.po"; \
cd $(builddir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
echo "cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
.sin.sed:
sed -e '/^#/d' $< > t-$@
@ -203,7 +203,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
fi
install: install-exec install-data
install: $(CATALOGS) install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
if test "$(PACKAGE)" = "gettext-tools"; then \