Workaround #9203 (Re: CVS: commit robsta abi/src/wp/ap/unix GNUmakefile.am)

Hi,

i'm posting this to -dev manually because i don't know if our friends
at INdT are subscribed to the cvs list yet.

I found that the introduction of conditional glade files prevented
/all/ glade files from installation (when configured for gtk or
gnome), at least with automake-1.9.4. Therefore i had to revert this
change and install all glade files independent of the configuration.
Surely a smarter solution can be found, especially for the HD
constrained 770 device. Maybe glade filenames as variables would work.

- Rob

On 6/25/05, cvs@abisource.com <cvs@abisource.com> wrote:
>
> Update of /cvsroot/abi/src/wp/ap/unix
> In directory abiword.snt.utwente.nl:/tmp/cvs-serv4627/src/wp/ap/unix
>
> Modified Files:
> GNUmakefile.am
> Log Message:
>
>
> Fix #9203 "ap_* glade files are no longer installed"
>
>
> Index: GNUmakefile.am
> ===================================================================
> RCS file: /cvsroot/abi/src/wp/ap/unix/GNUmakefile.am,v
> retrieving revision 1.58
> retrieving revision 1.59
> diff -u -d -r1.58 -r1.59
> --- GNUmakefile.am 21 Jun 2005 21:37:23 -0000 1.58
> +++ GNUmakefile.am 25 Jun 2005 13:44:20 -0000 1.59
> @@ -48,13 +48,10 @@
> ap_UnixDialog_Insert_DateTime.glade \
> ap_UnixDialog_MailMerge.glade \
> ap_UnixDialog_MetaData.glade \
> -#if WITH_HILDON
> ap_UnixHildonDialog_Options.glade \
> ap_UnixHildonDialog_HdrFtr.glade \
> -#else
> ap_UnixDialog_Options.glade \
> ap_UnixDialog_HdrFtr.glade \
> -#endif
> ap_UnixDialog_Options_ColorSel.glade \
> ap_UnixDialog_PageNumbers.glade \
> ap_UnixDialog_PageSetup.glade \
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
>
Received on Sat Jun 25 15:56:29 2005