po/makefile bug in cvs?
Hi, I tried to build apt from cvs, but it's failed in making
message catalogs. I guess it's because GETDOMAIN has a strange
value when the build-directory includes the same name as domain
name such as apt and libapt-pkg3.3.
For example, say I build apt at /home/taru/build/apt/.
In this case, $(call GETDOMAIN, /home/taru/build/apt/po/domains/apt/ja.po)
will be 'apt apt' because $(subst /, , $(1)) converts it to
'home taru build apt po domains apt ja.po', and therefore
$(filter $(DOMAINS),$(subst /, ,$(1))) converts to 'apt apt'.
The attached patch seems to fix this problem.
PS
I faced another problem as follows:
makefile:49: target `/home/taru/work/debian/build/po/domains/apt/@CATALOGS@' doesn't match the target pattern
makefile:49: target `/home/taru/work/debian/build/po/domains/libapt-pkg3.3/@CATALOGS@' doesn't match the target pattern
makefile:54: target `/home/taru/work/debian/build/po/domains/apt/@CATALOGS@' doesn't match the target pattern
makefile:55: warning: overriding commands for target `/home/taru/work/debian/build/po/domains/apt/@CATALOGS@'
makefile:50: warning: ignoring old commands for target `/home/taru/work/debian/build/po/domains/apt/@CATALOGS@'
makefile:54: target `/home/taru/work/debian/build/po/domains/libapt-pkg3.3/@CATALOGS@' doesn't match the target pattern
makefile:55: warning: overriding commands for target `/home/taru/work/debian/build/po/domains/libapt-pkg3.3/@CATALOGS@'
makefile:50: warning: ignoring old commands for target `/home/taru/work/debian/build/po/domains/libapt-pkg3.3/@CATALOGS@'
Generating /home/taru/work/debian/build/locale/@CATALOGS@/LC_MESSAGES/apt.mo: /usr/bin/msgfmt: no input file given
Try `/usr/bin/msgfmt --help' for more information.
It seems that a variable CATALOG is still @CATALOG@ in environment.mak.
CATALOGS = @CATALOGS@
Does anyone know why this happens? Do I need a specific version of
autotools or other tools?
Thanks
Index: po/makefile
===================================================================
RCS file: /cvs/deity/apt/po/makefile,v
retrieving revision 1.3
diff -u -r1.3 makefile
--- po/makefile 9 Nov 2002 20:12:37 -0000 1.3
+++ po/makefile 14 Nov 2002 11:41:33 -0000
@@ -23,7 +23,7 @@
LANG_POFILES := $(patsubst %.mo,%.po,$(MOFILES))
LINGUAS := $(patsubst %.gmo,%,$(CATALOGS))
-GETDOMAIN = $(filter $(DOMAINS),$(subst /, ,$(1)))
+GETDOMAIN = $(filter $(DOMAINS), $(subst /, , $(subst $(PO_DOMAINS),, $(1))))
# Generate the list of files from the bits the other make files dropped
# and produce the .pot file.
$(POTFILES) : $(PO)/%.pot :
Reply to: