[libvirt] [libvirt-php PATCH] Fix installation of libvirt-php.ini

[Michal Novotny]

On 05/11/2012 05:31 PM, Ivo van den Abeelen wrote:
> Building/installing libvirt-php seems to create an incomplete libvirt-php.ini file.
> This patch solves this issue, and replaces the '#' comments (deprecated in PHP 5.4).
> ---
>  src/Makefile.am |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 4efd960..dd08d36 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -18,14 +18,14 @@ install-exec-local:
>  	$(INSTALL) -m 644 -D $(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so
>  	$(INSTALL) -m 755 -d $(DESTDIR)$(PHPCDIR)
>  	$(ECHO) "extension=$(PACKAGE).so" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "[libvirt"] > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "# Path to ISO images for VM installations" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "libvirt.iso_path=/var/lib/libvirt/images" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "# Path where disk images for new VMs should be created" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "libvirt.image_path=/var/lib/libvirt/images" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "# Limit maximum number of libvirt connections" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "libvirt.max_connections=5" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "[libvirt]" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "; Path to ISO images for VM installations" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "libvirt.iso_path=/var/lib/libvirt/images" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "; Path where disk images for new VMs should be created" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "libvirt.image_path=/var/lib/libvirt/images" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "; Limit maximum number of libvirt connections" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "libvirt.max_connections=5" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
>  
>  uninstall-local:
>  	$(RM) -f $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini
Thanks Ivo! I've applied it now.

Michal

-- 
Michal Novotny <minovotn at redhat.com>, RHCE, Red Hat
Virtualization | libvirt-php bindings | php-virt-control.org