Sorry, I noticed there are no target files.
Adding BUILT_SOURCES is a workaround.
--- gok-1.3.7/Makefile.am.orig 2008-03-03 20:33:27.088377000 +0900
+++ gok-1.3.7/Makefile.am 2008-03-04 10:45:12.890844000 +0900
@@ -39,8 +39,8 @@ xam_files = $(xml_in_files:.xml.in=.xam)
kbd_files = $(kbd_in_files:.kbd.in=.kbd)
@INTLTOOL_KBD_RULE@
-xml_DATA = $(xam_files) \
- $(kbd_files)
+BUILT_SOURCES = $(kbd_files)
+xml_DATA = $(xam_files)
gladedir = $(pkgdatadir)/glade
@@ -137,11 +137,19 @@ if GCONF_SCHEMAS_INSTALL
endif
@for l in *; do \
if [ -f $$l/main.kbd ]; then \
+ if [ $$l = "C" ]; then \
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/gok; \
+ for f in $$l/*.kbd; do \
+ echo copying $$f to $(DESTDIR)$(datadir)/gok;
\
+ cp $$f $(DESTDIR)$(datadir)/gok; \
+ done; \
+ else \
$(mkinstalldirs) $(DESTDIR)$(datadir)/gok/$$l; \
for f in $$l/*.kbd; do \
echo copying $$f to
$(DESTDIR)$(datadir)/gok/$$l; \
cp $$f $(DESTDIR)$(datadir)/gok/$$l; \
done; \
+ fi; \
fi; \
done
--- spec-files/base-specs/gok.spec.orig 2008-03-03 20:51:25.619023000 +0900
+++ spec-files/base-specs/gok.spec 2008-03-04 13:23:09.135686000 +0900
@@ -86,9 +86,10 @@ if test "x$CPUS" = "x" -o $CPUS = 0; the
CPUS=1
fi
-aclocal $ACLOCAL_FLAGS
intltoolize --copy --force --automake
+aclocal $ACLOCAL_FLAGS
autoconf
+automake -a -c -f
CFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
But I think the right fix is for intltool instead of adding BUILT_SOURCES in
Makefile.am
I filed bugzilla 520252.
Thanks,
fujiwara
Takao Fujiwara - Tokyo S/W Center wrote:
> Thanks for your info. I didn't notice this issue.
> It seems xml_merge_output() in intltool-merge has been changed since intltool
> 0.36.3.
>
> ----------------------
> http://svn.gnome.org/viewvc/intltool/trunk/intltool-merge.in.in?r1=700&r2=705
>
> 2007-11-25 Rodney Dawes <dobey.pwns at gmail.com>
>
> * intltool-merge.in.in (xml_merge_output):
> Output the untranslated file in C/ for multiple output
> Only output in the current directory for single-file output
>
> Fixes #487817
> ----------------------
>
>
> One suggestion is to modify gok/Makefile.am and gok.spec or revert the
> intltool version to 0.36.2.
>
> --- gok-1.3.7/Makefile.am.orig 2008-03-03 20:33:27.088377000 +0900
> +++ gok-1.3.7/Makefile.am 2008-03-03 20:33:46.009825000 +0900
> @@ -39,8 +39,7 @@ xam_files = $(xml_in_files:.xml.in=.xam)
> kbd_files = $(kbd_in_files:.kbd.in=.kbd)
> @INTLTOOL_KBD_RULE@
>
> -xml_DATA = $(xam_files) \
> - $(kbd_files)
> +xml_DATA = $(xam_files)
>
> gladedir = $(pkgdatadir)/glade
>
> --- spec-files/base-specs/gok.spec.orig 2008-03-03 20:51:25.619023000 +0900
> +++ spec-files/base-specs/gok.spec 2008-03-03 20:51:48.015430000 +0900
> @@ -103,6 +103,11 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INS
> make DESTDIR=$RPM_BUILD_ROOT install
> unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
>
> +if [ -f $RPM_BUILD_ROOT/%{_datadir}/gok/C/main.kbd ] ; then
> + mv $RPM_BUILD_ROOT/%{_datadir}/gok/C/*.kbd
> $RPM_BUILD_ROOT/%{_datadir}/gok/.
> + rmdir $RPM_BUILD_ROOT/%{_datadir}/gok/C
> +fi
> +
>
> # Remove unwanted files
> rm -rf $RPM_BUILD_ROOT%{_prefix}/var
>
> Thanks,
> fujiwara
>
> Li Yuan wrote:
>
>>Patrick Ale wrote:
>>
>>
>>>
>>>SUNWgnome-ay11-gok (long lasting problem)
>>>pkgbuild: /opt/jdsbld/bin/install -c -m 644 './mouse.kbd'
>>>'/var/tmp/pkgbuild-build/SUNWgnome-a11y-gok-2.21.92-build/usr/share/gok/mouse.kbd'
>>>
>>>
>>>pkgbuild: /opt/jdsbld/bin/install: cannot stat `./mouse.kbd': No such
>>>file or directory
>>>pkgbuild: make[2]: *** [install-xmlDATA] Error 1
>>>pkgbuild: make[2]: Leaving directory
>>>`/export/home/build/packages/BUILD/SUNWgnome-a11y-gok-2.21.92/gok-1.3.7'
>>>pkgbuild: make[1]: *** [install-am] Error 2
>>>pkgbuild: make[1]: Leaving directory
>>>`/export/home/build/packages/BUILD/SUNWgnome-a11y-gok-2.21.92/gok-1.3.7'
>>>
>>>
>>
>>Seems *.kbd files are not generated in gok-1.3.7 directory but in
>>gok-1.3.7/C. The command which is used during build is:
>>"LC_ALL=C ./intltool-merge -x -u -m -c ./po/.intltool-merge-cache ./po
>>numberpad.kbd.in numberpad.kbd"
>>
>>If I build by myself, the file is created in gok-1.3.7 which is OK. If I
>>build by pkgbuild, the file is created in gok-1.3.7/C and cannot be
>>found by /opt/jdsbld/bin/install.
>>
>>Takao, do you have any idea on this? Did intltool-merge read any
>>environment?
>>
>>Thanks,
>>Li
>>
>>
>>
>>
>
>
>
> _______________________________________________
> desktop-discuss mailing list
> desktop-discuss at opensolaris.org
>
